From d50e01d0c62a31d6b4549abbfac031b680f89cf8 Mon Sep 17 00:00:00 2001 From: wm4 Date: Sat, 13 Jun 2015 22:02:09 +0200 Subject: demux_mkv: fix mpeg2 mapping It's well possible that we've always ended up invoking the AV_CODEC_ID_MPEG1VIDEO codec, but it's hard to tell. Mangling everything through FourCCs (and then back) makes it hard to analyze. Also, libavformat's Matroska demuxer uses AV_CODEC_ID_MPEG2VIDEO here, so it should be quite safe to do anyway. --- demux/demux_mkv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'demux') diff --git a/demux/demux_mkv.c b/demux/demux_mkv.c index 41dc534f0d..b9c9d9e74c 100644 --- a/demux/demux_mkv.c +++ b/demux/demux_mkv.c @@ -1201,7 +1201,7 @@ typedef struct { static const videocodec_info_t vinfo[] = { {MKV_V_MJPEG, "mjpeg", 1}, {MKV_V_MPEG1, "mpeg1video", 0}, - {MKV_V_MPEG2, "mpeg1video", 0}, + {MKV_V_MPEG2, "mpeg2video", 0}, {MKV_V_MPEG4_SP, "mpeg4", 1}, {MKV_V_MPEG4_ASP, "mpeg4", 1}, {MKV_V_MPEG4_AP, "mpeg4", 1}, -- cgit v1.2.3