Skip to content

V
vlc
Commit 2b602203 authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf
Browse files
Options

Ffmpeg FOURCC: Mjpeg (notably support for AVID MJPEG)

parent 07ff3bd7
Hide whitespace changes
Inline Side-by-side
Showing with 9 additions and 1 deletion
modules/codec/ffmpeg/ffmpeg.c
View file @ 2b602203
...@@ -763,9 +763,17 @@ static struct ...@@ -763,9 +763,17 @@ static struct
{ VLC_FOURCC( 'A','V','D','J' ), CODEC_ID_MJPEG, { VLC_FOURCC( 'A','V','D','J' ), CODEC_ID_MJPEG,
VIDEO_ES, "Motion JPEG Video" }, VIDEO_ES, "Motion JPEG Video" },
{ VLC_FOURCC( 'd','m','b','1' ), CODEC_ID_MJPEG, { VLC_FOURCC( 'd','m','b','1' ), CODEC_ID_MJPEG,
VIDEO_ES, "Motion JPEG Video" }, VIDEO_ES, "Motion JPEG OpenDML Video" },
{ VLC_FOURCC( 'm','j','p','b' ), CODEC_ID_MJPEGB, /* for mov file */ { VLC_FOURCC( 'm','j','p','b' ), CODEC_ID_MJPEGB, /* for mov file */
VIDEO_ES, "Motion JPEG B Video" }, VIDEO_ES, "Motion JPEG B Video" },
{ VLC_FOURCC( 'L','J','P','G' ), CODEC_ID_LJPEG,
VIDEO_ES, "Lead Motion JPEG Video" },
{ VLC_FOURCC( 'L','J','P','G' ), CODEC_ID_MJPEG,
VIDEO_ES, "Lead Motion JPEG Video" },
{ VLC_FOURCC( 'A','V','R','n' ), CODEC_ID_MJPEG,
VIDEO_ES, "Avid Motion JPEG" },
{ VLC_FOURCC( 'A','D','J','V' ), CODEC_ID_MJPEG,
VIDEO_ES, "Avid Motion JPEG" },
{ VLC_FOURCC( 'S','P','5','X' ), CODEC_ID_SP5X, { VLC_FOURCC( 'S','P','5','X' ), CODEC_ID_SP5X,
VIDEO_ES, "Sunplus Motion JPEG Video" }, VIDEO_ES, "Sunplus Motion JPEG Video" },
......
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