[SCM] libav/experimental: dont discard first frame patch by (Lennert Buytenhek <buytenh at math dot leidenuniv dot nl>)

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Jun 30 15:33:10 UTC 2013


The following commit has been merged in the experimental branch:
commit 5bd11e314e3acb626edbd3f4560337639f4a07e1
Author: Lennert Buytenhek <buytenh at math.leidenuniv.nl>
Date:   Sun Sep 1 07:40:31 2002 +0000

    dont discard first frame patch by (Lennert Buytenhek <buytenh at math dot leidenuniv dot nl>)
    
    Originally committed as revision 890 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/mp3lameaudio.c b/libavcodec/mp3lameaudio.c
index 9a9fee0..a047e1a 100644
--- a/libavcodec/mp3lameaudio.c
+++ b/libavcodec/mp3lameaudio.c
@@ -23,7 +23,6 @@
 
 typedef struct Mp3AudioContext {
 	lame_global_flags *gfp;
-	int first_frame;
 	int stereo;
 } Mp3AudioContext;
 
@@ -35,7 +34,6 @@ static int MP3lame_encode_init(AVCodecContext *avctx)
 	if (avctx->channels > 2)
 		return -1;
 
-	s->first_frame = 1;
 	s->stereo = avctx->channels > 1 ? 1 : 0;
 
 	if ((s->gfp = lame_init()) == NULL)
@@ -77,9 +75,6 @@ int MP3lame_encode_frame(AVCodecContext *avctx,
 			frame, buf_size);
 	}
 
-	/* lame 3.91 outputs the first frame as garbage */
-	if (s->first_frame)
-		s->first_frame = num = 0;
 	return num;
 }
 

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list