Skip to content

V
vlc
Commit 332ded0c authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont
Browse files
Options

fourcc: remove last conflicting FourCC alias

parent 83ab5bb6
Show whitespace changes
Inline Side-by-side
Showing with 0 additions and 4 deletions
src/misc/fourcc_list.h
View file @ 332ded0c
...@@ -326,7 +326,6 @@ static const staticentry_t p_list_video[] = { ...@@ -326,7 +326,6 @@ static const staticentry_t p_list_video[] = {
A("mjpa"), A("mjpa"),
A("JFIF"), A("JFIF"),
A("JPGL"), A("JPGL"),
A("LJPG"),
A("MMJP"), A("MMJP"),
A("FLJP"), A("FLJP"),
A("FMJP"), A("FMJP"),
...@@ -350,9 +349,6 @@ static const staticentry_t p_list_video[] = { ...@@ -350,9 +349,6 @@ static const staticentry_t p_list_video[] = {
B(VLC_CODEC_LJPG, "Lead Motion JPEG Video"), B(VLC_CODEC_LJPG, "Lead Motion JPEG Video"),
E("Ljpg", "Lead Motion JPEG"), 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 */ /* SP5x */
B(VLC_CODEC_SP5X, "Sunplus Motion JPEG Video"), B(VLC_CODEC_SP5X, "Sunplus Motion JPEG Video"),
A("SP5X"), A("SP5X"),
......
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