Merge remote-tracking branch 'cehoyos/master'

* cehoyos/master:
  Try mov tags if the fourcc in V_MS/VFW mkv files cannot be found in bmp tags.
Merged-by: Michael Niedermayer <michaelni@gmx.at>

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         &&