[FFmpeg-cvslog] avformat/avidec: Fix txts fmts parsing

Michael Niedermayer git at videolan.org
Wed May 31 03:33:55 EEST 2017


ffmpeg | branch: master | Michael Niedermayer <michael at niedermayer.cc> | Tue May 30 21:20:54 2017 +0200| [78f6ec32a37215f21e1efb299e233f1c0e031a0b] | committer: Michael Niedermayer

avformat/avidec: Fix txts fmts parsing

Fixes: subtitle.avi from vlc/ticket/1162

Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>

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

 libavformat/avidec.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/libavformat/avidec.c b/libavformat/avidec.c
index 4e694fe447..b6ef0ac62d 100644
--- a/libavformat/avidec.c
+++ b/libavformat/avidec.c
@@ -727,7 +727,8 @@ FF_ENABLE_DEPRECATION_WARNINGS
             break;
         case MKTAG('s', 't', 'r', 'f'):
             /* stream header */
-            if (!size)
+            if (!size && (codec_type == AVMEDIA_TYPE_AUDIO ||
+                          codec_type == AVMEDIA_TYPE_VIDEO))
                 break;
             if (stream_index >= (unsigned)s->nb_streams || avi->dv_demux) {
                 avio_skip(pb, size);



More information about the ffmpeg-cvslog mailing list