Commit cecf9be9 authored by Ilkka Ollakka's avatar Ilkka Ollakka

differentiate mp1v from mp2v and default mpgv to mp2v

Fixes #5864
Signed-off-by: Ilkka Ollakka's avatarIlkka Ollakka <ileoo@videolan.org>
parent dc05b32f
......@@ -47,8 +47,9 @@ static const struct
* Video Codecs
*/
{ VLC_CODEC_MP2V, AV_CODEC_ID_MPEG2VIDEO, VIDEO_ES }, /* prefer MPEG2 over MPEG1 */
{ VLC_CODEC_MPGV, AV_CODEC_ID_MPEG2VIDEO, VIDEO_ES }, /* prefer MPEG2 over MPEG1 */
{ VLC_CODEC_MPGV, AV_CODEC_ID_MPEG1VIDEO, VIDEO_ES },
{ VLC_CODEC_MP1V, AV_CODEC_ID_MPEG1VIDEO, VIDEO_ES },
/* AV_CODEC_ID_MPEG2VIDEO_XVMC */
{ VLC_CODEC_H261, AV_CODEC_ID_H261, VIDEO_ES },
{ VLC_CODEC_H263, AV_CODEC_ID_H263, VIDEO_ES },
......
......@@ -67,11 +67,13 @@ typedef struct
/* */
static const staticentry_t p_list_video[] = {
B(VLC_CODEC_MPGV, "MPEG-1/2 Video"),
A("mpgv"),
B(VLC_CODEC_MP1V, "MPEG-1 Video"),
A("mp1v"),
A("mpeg"),
A("mpg1"),
B(VLC_CODEC_MP2V, "MPEG-2 Video"),
A("mpgv"),
A("mpeg"),
A("mp2v"),
A("MPEG"),
A("mpg2"),
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment