diff options
| author | Ladislav Hagara | 2011-04-28 18:30:24 +0200 |
|---|---|---|
| committer | Ladislav Hagara | 2011-04-28 18:30:24 +0200 |
| commit | bf3a1b25c90de3cfc8fb79f6e7a2e7e81952d073 (patch) | |
| tree | e7acb88f2d8bac0c7d52c342c6e16056a4a90de1 | |
| parent | 811fe741b78d6242b21913de0066f34bcad3496c (diff) | |
ffmpeg 0.7-rc1
| -rwxr-xr-x | video/ffmpeg/DEPENDS | 4 | ||||
| -rwxr-xr-x | video/ffmpeg/DETAILS | 4 | ||||
| -rw-r--r-- | video/ffmpeg/HISTORY | 5 | ||||
| -rwxr-xr-x | video/ffmpeg/PRE_BUILD | 2 | ||||
| -rw-r--r-- | video/ffmpeg/libmp3lame.patch | 29 |
5 files changed, 7 insertions, 37 deletions
diff --git a/video/ffmpeg/DEPENDS b/video/ffmpeg/DEPENDS index 25a6335674..5bde873b46 100755 --- a/video/ffmpeg/DEPENDS +++ b/video/ffmpeg/DEPENDS @@ -15,10 +15,6 @@ optional_depends "libvorbis" \ "--enable-libvorbis" \ "" \ "for ogg/vorbis support" && -optional_depends "faad2" \ - "--enable-libfaad" \ - "" \ - "for AAC audio support" && optional_depends "imlib2" \ "" \ "" \ diff --git a/video/ffmpeg/DETAILS b/video/ffmpeg/DETAILS index 790ce6f269..ff37127053 100755 --- a/video/ffmpeg/DETAILS +++ b/video/ffmpeg/DETAILS @@ -1,10 +1,10 @@ SPELL=ffmpeg - VERSION=0.6.3 + VERSION=0.7-rc1 SECURITY_PATCH=4 SOURCE=$SPELL-$VERSION.tar.bz2 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION" SOURCE_URL[0]=http://ffmpeg.org/releases/$SOURCE - SOURCE_HASH=sha512:0d45ce4b08d6cf05ba349d23f326169c4ad98768603e5c33a6efe57f073470ef7481d6126e50a9437024f6fa2d362ae563fb56ac999e97d23353c04ddb2d6f08 + SOURCE_HASH=sha512:71d16758ff83300ad48188e6c18b6d90ea5907923a15b432cdece205ac9747a3c16f6dab42d281c96d94cadebc64752456212a0504bf47f70f4fe0fcf9f59276 #case $FFAMR in # none);; # *) diff --git a/video/ffmpeg/HISTORY b/video/ffmpeg/HISTORY index f5bfc3ec58..8e11f7edc0 100644 --- a/video/ffmpeg/HISTORY +++ b/video/ffmpeg/HISTORY @@ -1,3 +1,8 @@ +2011-04-28 Ladislav Hagara <hgr@vabo.cz> + * DETAILS: 0.7-rc1 + * DEPENDS: faad2 removed + * PRE_BUILD, libmp3lame.patch: patch removed + 2011-04-27 Julien "_kaze_" ROZO <julien@rozo.org> * DETAILS: updated version to 0.6.3 diff --git a/video/ffmpeg/PRE_BUILD b/video/ffmpeg/PRE_BUILD index 559b8344b0..7e686d0e03 100755 --- a/video/ffmpeg/PRE_BUILD +++ b/video/ffmpeg/PRE_BUILD @@ -1,8 +1,6 @@ default_pre_build && cd $SOURCE_DIRECTORY && -patch -p0 < "$SPELL_DIRECTORY/libmp3lame.patch" && - #fix bad pkg-config files sed -i \ -e '/^pkg.*{/,/^}/ s|\$libdir|\$\{prefix\}/lib|;s|\$incdir|\$\{prefix\}/include|'\ diff --git a/video/ffmpeg/libmp3lame.patch b/video/ffmpeg/libmp3lame.patch deleted file mode 100644 index 4838700ebd..0000000000 --- a/video/ffmpeg/libmp3lame.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- libavcodec/libmp3lame.c.orig 2008-08-09 21:37:36.000000000 +0400 -+++ libavcodec/libmp3lame.c 2009-02-03 11:22:37.000000000 +0300 -@@ -34,6 +34,7 @@ - int stereo; - uint8_t buffer[BUFFER_SIZE]; - int buffer_index; -+ int flushed; - } Mp3AudioContext; - - static av_cold int MP3lame_encode_init(AVCodecContext *avctx) -@@ -166,12 +167,18 @@ - BUFFER_SIZE - s->buffer_index - ); - } -+ s->flushed = 0; - }else{ -+ if (s->flushed) -+ lame_result = 0; -+ else { -+ s->flushed = 1; - lame_result= lame_encode_flush( - s->gfp, - s->buffer + s->buffer_index, - BUFFER_SIZE - s->buffer_index - ); -+ } - } - - if(lame_result==-1) { |