diff options
| author | Arkadiusz Miśkiewicz | 2010-07-16 06:18:37 (GMT) |
|---|---|---|
| committer | cvs2git | 2012-06-24 12:13:13 (GMT) |
| commit | b63ac6d389b94859650294ad181a3a54f36b3b76 (patch) | |
| tree | f18aaaa1fb6ebc968e2b50ba19014f72847d4b2c | |
| parent | 5ca0601c97ac21f72e82d4c43d99785cefaf4f49 (diff) | |
| download | mpeg4ip-b63ac6d389b94859650294ad181a3a54f36b3b76.zip mpeg4ip-b63ac6d389b94859650294ad181a3a54f36b3b76.tar.gz | |
- rel 13; build fixedauto/th/mpeg4ip-1_6_1-13
Changed files:
mpeg4ip-ffmpeg.patch -> 1.4
mpeg4ip.spec -> 1.71
| -rw-r--r-- | mpeg4ip-ffmpeg.patch | 4 | ||||
| -rw-r--r-- | mpeg4ip.spec | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/mpeg4ip-ffmpeg.patch b/mpeg4ip-ffmpeg.patch index f0981d7..00ad93c 100644 --- a/mpeg4ip-ffmpeg.patch +++ b/mpeg4ip-ffmpeg.patch @@ -38,7 +38,7 @@ AC_MSG_NOTICE([have enable ffmpeg $enable_ffmpeg]) FFMPEG_INC=-I${enable_ffmpeg}/libavcodec - FFMPEG_LIB="${enable_ffmpeg}/libavcodec/libavcodec.a -lz" -+ FFMPEG_LIB="-lavcodec -lz" ++ FFMPEG_LIB="-lavcodec -lavutil -lz" saveCFLAGS="$CFLAGS" CFLAGS="$CFLAGS $FFMPEG_INC" AC_CHECK_TYPES([AVRational], , , [#include <avcodec.h>]) @@ -50,7 +50,7 @@ diff -burNp mpeg4ip-1.6.1/configure.in mpeg4ip-1.6.1-new/configure.in AC_DEFINE(HAVE_FFMPEG_INSTALLED, 1, [defined if ffmpeg is installed]) FFMPEG_INC= - FFMPEG_LIB="-lavcodec -lz $ffmpeg_add_libs" -+ FFMPEG_LIB="-lavcodec -lz $ffmpeg_add_libs $(pkg-config libswscale --libs --silence-errors)" ++ FFMPEG_LIB="-lavcodec -lavutil -lz $ffmpeg_add_libs $(pkg-config libswscale --libs --silence-errors)" AC_CHECK_TYPES([AVRational], , , [#include <ffmpeg/avcodec.h>]) AC_CHECK_MEMBERS(AVCodecContext.time_base, , , [#include <ffmpeg/avcodec.h>]) AC_CHECK_DECLS([avcodec_decode_audio2], , ,[#include <ffmpeg/avcodec.h>]) diff --git a/mpeg4ip.spec b/mpeg4ip.spec index 2c21540..7a91e50 100644 --- a/mpeg4ip.spec +++ b/mpeg4ip.spec @@ -11,7 +11,7 @@ Summary: MPEG4IP - system for encoding, streaming and playing MPEG-4 audio/video Summary(pl.UTF-8): MPEG4IP - system kodowania, streamingu i odtwarzania dźwięku i obrazu MPEG-4 Name: mpeg4ip Version: 1.6.1 -Release: 12 +Release: 13 Epoch: 1 License: MPL v1.1 (original code) and other licenses (included libraries) Group: Applications |