[FFmpeg-devel] [PATCH] flvdec: actually accept new extradata.

Nicolas George nicolas.george at normalesup.org
Sun Jan 29 17:21:04 CET 2012


This test should have been removed when the following commit was merged:
251f320 flvdec: Export new AAC/H.264 extradata as side data on the next packet

Signed-off-by: Nicolas George <nicolas.george at normalesup.org>
---
 libavformat/flvdec.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


The current code is clearly wrong:

	if (!foo) {
	    if (foo) {

Regards,

-- 
  Nicolas George


diff --git a/libavformat/flvdec.c b/libavformat/flvdec.c
index 1f1424e..e58366f 100644
--- a/libavformat/flvdec.c
+++ b/libavformat/flvdec.c
@@ -580,7 +580,7 @@ static int flv_read_packet(AVFormatContext *s, AVPacket *pkt)
             if (flv->wrong_dts)
                 dts = AV_NOPTS_VALUE;
         }
-        if (type == 0 && !st->codec->extradata) {
+        if (type == 0) {
             if (st->codec->extradata) {
                 if ((ret = flv_queue_extradata(flv, s->pb, stream_type, size)) < 0)
                     return ret;
-- 
1.7.8.3



More information about the ffmpeg-devel mailing list