[vlc-commits] fourcc: remove last conflicting FourCC alias

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Fri Jun 12 21:35:00 2015 +0300| [332ded0cc7fc97df31927e9894ab80ba7ee17429] | committer: Rémi Denis-Courmont

fourcc: remove last conflicting FourCC alias

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

 src/misc/fourcc_list.h |    4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/misc/fourcc_list.h b/src/misc/fourcc_list.h
index dcc9c57..c532066 100644
--- a/src/misc/fourcc_list.h
+++ b/src/misc/fourcc_list.h
@@ -326,7 +326,6 @@ static const staticentry_t p_list_video[] = {
         A("mjpa"),
         A("JFIF"),
         A("JPGL"),
-        A("LJPG"),
         A("MMJP"),
         A("FLJP"),
         A("FMJP"),
@@ -350,9 +349,6 @@ static const staticentry_t p_list_video[] = {
     B(VLC_CODEC_LJPG, "Lead Motion JPEG Video"),
         E("Ljpg", "Lead Motion JPEG"),
 
-    // ? from avcodec/fourcc.c but makes not sense.
-    //{ VLC_FOURCC( 'L','J','P','G' ), CODEC_ID_MJPEG,       VIDEO_ES, "Lead Motion JPEG Video" },
-
     /* SP5x */
     B(VLC_CODEC_SP5X, "Sunplus Motion JPEG Video"),
         A("SP5X"),