vlc | branch: master | Ilkka Ollakka <il...@videolan.org> | Fri Feb 14 12:44:14 2014 +0200| [cecf9be95453c30e3947dc06f5ea87a960f10fa5] | committer: Ilkka Ollakka
differentiate mp1v from mp2v and default mpgv to mp2v Fixes #5864 Signed-off-by: Ilkka Ollakka <il...@videolan.org> > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=cecf9be95453c30e3947dc06f5ea87a960f10fa5 --- modules/codec/avcodec/fourcc.c | 3 ++- src/misc/fourcc.c | 8 +++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/modules/codec/avcodec/fourcc.c b/modules/codec/avcodec/fourcc.c index 7101fd8..25e66cf 100644 --- a/modules/codec/avcodec/fourcc.c +++ b/modules/codec/avcodec/fourcc.c @@ -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 }, diff --git a/src/misc/fourcc.c b/src/misc/fourcc.c index a042303..62a1161 100644 --- a/src/misc/fourcc.c +++ b/src/misc/fourcc.c @@ -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"), _______________________________________________ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
