[FFmpeg-cvslog] Try mov tags if the fourcc in V_MS/ VFW mkv files cannot be found in bmp tags.

[Carl Eugen Hoyos]

ffmpeg | branch: master | Carl Eugen Hoyos <cehoyos at ag.or.at> | Sun Apr 27 09:34:13 2014 +0200| [ade5851be085d392cc7490d4cf64c6fe4ac6ae6a] | committer: Carl Eugen Hoyos

Try mov tags if the fourcc in V_MS/VFW mkv files cannot be found in bmp tags.

Fixes decoding of broken mkv files containing ProRes video from ticket #3434.

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

 libavformat/matroskadec.c |    3 +++
 1 file changed, 3 insertions(+)

diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c
index 66268fd..7c10f33 100644
--- a/libavformat/matroskadec.c
+++ b/libavformat/matroskadec.c
@@ -1760,6 +1760,9 @@ static int matroska_read_header(AVFormatContext *s)
             fourcc              = AV_RL32(track->codec_priv.data + 16);
             codec_id            = ff_codec_get_id(ff_codec_bmp_tags,
                                                   fourcc);
+            if (!codec_id)
+                codec_id        = ff_codec_get_id(ff_codec_movvideo_tags,
+                                                  fourcc);
             extradata_offset    = 40;
         } else if (!strcmp(track->codec_id, "A_MS/ACM") &&
                    track->codec_priv.size >= 14         &&