[vlc-devel] commit: Manually backport [fbbdb7571d7e81a6d690febef1acac768205fabf] Thanks , funman! ( Felix Paul Kühne )

[git version control]

vlc | branch: 0.8.6-bugfix | Felix Paul Kühne <fkuehne at videolan.org> | Mon May 26 22:47:42 2008 +0200| [d778cd3a0f27202d31bab1bed6209138d012366a]

Manually backport [fbbdb7571d7e81a6d690febef1acac768205fabf] Thanks, funman!

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=d778cd3a0f27202d31bab1bed6209138d012366a
---

 modules/codec/ffmpeg/ffmpeg.c |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)

diff --git a/modules/codec/ffmpeg/ffmpeg.c b/modules/codec/ffmpeg/ffmpeg.c
index fffbe24..1514543 100644
--- a/modules/codec/ffmpeg/ffmpeg.c
+++ b/modules/codec/ffmpeg/ffmpeg.c
@@ -527,8 +527,6 @@ static struct
       VIDEO_ES, "MPEG-1 Video" },
     { VLC_FOURCC('m','p','g','1'), CODEC_ID_MPEG1VIDEO,
       VIDEO_ES, "MPEG-1 Video" },
-    { VLC_FOURCC('m','p','e','g'), CODEC_ID_MPEG1VIDEO,
-      VIDEO_ES, "MPEG-1 Video" },
     { VLC_FOURCC('P','I','M','1'), CODEC_ID_MPEG1VIDEO,
       VIDEO_ES, "Pinnacle DC1000 (MPEG-1 Video)" },