summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2015-06-13 22:02:09 +0200
committerwm4 <wm4@nowhere>2015-06-13 22:34:23 +0200
commitd50e01d0c62a31d6b4549abbfac031b680f89cf8 (patch)
treeb407898db983cb594e70574546cd3ecd63e28285
parentfd88fb70aff630d4d6a861c02c63aeeca5e8f3ca (diff)
downloadmpv-d50e01d0c62a31d6b4549abbfac031b680f89cf8.tar.bz2
mpv-d50e01d0c62a31d6b4549abbfac031b680f89cf8.tar.xz
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.
-rw-r--r--demux/demux_mkv.c2
1 files changed, 1 insertions, 1 deletions
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},