Merged mp1v/mp2v codecs.

[vlc] / modules / codec / avcodec / fourcc.c

diff --git a/modules/codec/avcodec/fourcc.c b/modules/codec/avcodec/fourcc.c
index 686b2fa10caa87a348bb8d79e45b72e2a34fbce0..6e18746cc4270173fe840330330b021d1cf3a6fc 100644 (file)
--- a/modules/codec/avcodec/fourcc.c
+++ b/modules/codec/avcodec/fourcc.c
@@ -52,9 +52,7 @@ static const struct
      * Video Codecs
      */
 
-    { VLC_CODEC_MP1V, CODEC_ID_MPEG1VIDEO, VIDEO_ES },
-
-    { VLC_CODEC_MP2V, CODEC_ID_MPEG2VIDEO, VIDEO_ES },
+    { VLC_CODEC_MPGV, CODEC_ID_MPEG2VIDEO, VIDEO_ES },
 
     { VLC_CODEC_MP4V, CODEC_ID_MPEG4, VIDEO_ES },
     /* 3ivx delta 3.5 Unsupported