[FFmpeg-cvslog] flvdec: disable new midstream param change code not only for h264 but all cases.

Michael Niedermayer git at videolan.org
Fri Dec 23 23:08:34 CET 2011


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Dec 23 19:52:15 2011 +0100| [8ff4fff7741a2febfd52be80cee4aadba9f9d760] | committer: Michael Niedermayer

flvdec: disable new midstream param change code not only for h264 but all cases.
It breaks some samples and iam not aware of one that it fixes.

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=8ff4fff7741a2febfd52be80cee4aadba9f9d760
---

 libavformat/flvdec.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/libavformat/flvdec.c b/libavformat/flvdec.c
index 765eee5..57ef061 100644
--- a/libavformat/flvdec.c
+++ b/libavformat/flvdec.c
@@ -581,7 +581,7 @@ static int flv_read_packet(AVFormatContext *s, AVPacket *pkt)
             if (flv->wrong_dts)
                 dts = AV_NOPTS_VALUE;
         }
-        if (type == 0 && (!st->codec->extradata || st->codec->codec_id != CODEC_ID_H264)) {
+        if (type == 0 && !st->codec->extradata) {
             if (st->codec->extradata) {
                 if ((ret = flv_queue_extradata(flv, s->pb, stream_type, size)) < 0)
                     return ret;



More information about the ffmpeg-cvslog mailing list