[FFmpeg-cvslog] avformat/wtvdec: populate codec_tag from BITMAPINFOHEADER

Peter Ross git at videolan.org
Fri Apr 4 18:30:42 CEST 2014


ffmpeg | branch: master | Peter Ross <pross at xvid.org> | Fri Apr  4 22:07:47 2014 +1100| [0cc685e3add756a72fdd750802b3f7ceb3e7914f] | committer: Michael Niedermayer

avformat/wtvdec: populate codec_tag from BITMAPINFOHEADER

Signed-off-by: Peter Ross <pross at xvid.org>
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

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

 libavformat/wtvdec.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavformat/wtvdec.c b/libavformat/wtvdec.c
index bf27f29..597a11f 100644
--- a/libavformat/wtvdec.c
+++ b/libavformat/wtvdec.c
@@ -562,7 +562,7 @@ static int parse_videoinfoheader2(AVFormatContext *s, AVStream *st)
     AVIOContext *pb = wtv->pb;
 
     avio_skip(pb, 72);  // picture aspect ratio is unreliable
-    ff_get_bmp_header(pb, st, NULL);
+    st->codec->codec_tag = ff_get_bmp_header(pb, st, NULL);
 
     return 72 + 40;
 }



More information about the ffmpeg-cvslog mailing list