[SM-Commit] GIT changes to master grimoire by Vlad Glagolev (2198c0178ee79c56fc35e2ca94901f0295180f9b)

Vlad Glagolev scm at sourcemage.org
Thu Oct 1 07:04:03 EDT 2009


GIT changes to master grimoire by Vlad Glagolev <stealth at sourcemage.org>:

 video/ffmpeg/DETAILS          |    6 +++---
 video/ffmpeg/HISTORY          |    5 +++++
 video/ffmpeg/PRE_BUILD        |    5 ++++-
 video/ffmpeg/libmp3lame.patch |   29 +++++++++++++++++++++++++++++
 4 files changed, 41 insertions(+), 4 deletions(-)

New commits:
commit 2198c0178ee79c56fc35e2ca94901f0295180f9b
Author: Vlad Glagolev <stealth at sourcemage.org>
Commit: Vlad Glagolev <stealth at sourcemage.org>

    ffmpeg: added patch that fixes Issue803 of ffmpeg

diff --git a/video/ffmpeg/DETAILS b/video/ffmpeg/DETAILS
index 53dd95e..9b61a97 100755
--- a/video/ffmpeg/DETAILS
+++ b/video/ffmpeg/DETAILS
@@ -1,7 +1,7 @@
            SPELL=ffmpeg
          VERSION=0.5
           SOURCE=$SPELL-$VERSION.tar.bz2
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
    SOURCE_URL[0]=http://ffmpeg.org/releases/$SOURCE
      SOURCE_HASH=sha512:46e0c04939bdfd9aaa3ac622952c0eaf15bfd1b971f08591ee6e216bc218237d92844f173782e4ca81a224e39ca5c5ff2b1f30411728508db4d5bad3dc50c0d2
 #case $FFAMR in 
@@ -26,10 +26,10 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
 #esac
         WEB_SITE=http://ffmpeg.sourceforge.net
          ENTERED=20030514
-      PATCHLEVEL=1
+      PATCHLEVEL=2
       LICENSE[0]=GPL
         KEYWORDS="video"
-           SHORT="ffmpeg is complete video and audio broadcasting solution"
+           SHORT="complete video and audio broadcasting solution"
 cat << EOF
 FFMpeg is a complete and free Internet live audio and video
 broadcasting solution for Linux/Unix. It also includes a digital VCR. 
diff --git a/video/ffmpeg/HISTORY b/video/ffmpeg/HISTORY
index d74cc7d..eec68b3 100644
--- a/video/ffmpeg/HISTORY
+++ b/video/ffmpeg/HISTORY
@@ -1,3 +1,8 @@
+2009-10-01 Vlad Glagolev <stealth at sourcemage.org>
+	* PRE_BUILD: apply the patch
+	* DETAILS: quoting paths; PATCHLEVEL+=1
+	* libmp3lame.patch: added, fixes ffmpeg Issue803
+
 2009-08-23 Treeve Jelbert <treeve at sourcemage.org>
 	* TRIGGERS: added, for x264
 
diff --git a/video/ffmpeg/PRE_BUILD b/video/ffmpeg/PRE_BUILD
index 0de9ae5..559b834 100755
--- a/video/ffmpeg/PRE_BUILD
+++ b/video/ffmpeg/PRE_BUILD
@@ -1,5 +1,8 @@
 default_pre_build          &&
-cd $SOURCE_DIRECTORY 	   &&
+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
new file mode 100644
index 0000000..4838700
--- /dev/null
+++ b/video/ffmpeg/libmp3lame.patch
@@ -0,0 +1,29 @@
+--- 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) {



More information about the SM-Commit mailing list