Commit d192cba0 authored by Sébastien Escudier's avatar Sébastien Escudier

Support of Mxpeg codec

(cherry picked from commit a6fdd02e)
Signed-off-by: default avatarSébastien Escudier <sebastien-devel@celeos.eu>
parent 18169aa3
...@@ -119,6 +119,7 @@ ...@@ -119,6 +119,7 @@
#define VLC_CODEC_LAGARITH VLC_FOURCC('L','A','G','S') #define VLC_CODEC_LAGARITH VLC_FOURCC('L','A','G','S')
#define VLC_CODEC_FLASHSV2 VLC_FOURCC('F','S','V','2') #define VLC_CODEC_FLASHSV2 VLC_FOURCC('F','S','V','2')
#define VLC_CODEC_PRORES VLC_FOURCC('a','p','c','n') #define VLC_CODEC_PRORES VLC_FOURCC('a','p','c','n')
#define VLC_CODEC_MXPEG VLC_FOURCC('M','X','P','G')
/* Planar YUV 4:1:0 Y:V:U */ /* Planar YUV 4:1:0 Y:V:U */
#define VLC_CODEC_YV9 VLC_FOURCC('Y','V','U','9') #define VLC_CODEC_YV9 VLC_FOURCC('Y','V','U','9')
......
...@@ -206,6 +206,10 @@ static const struct ...@@ -206,6 +206,10 @@ static const struct
{ VLC_CODEC_LAGARITH, CODEC_ID_LAGARITH, VIDEO_ES }, { VLC_CODEC_LAGARITH, CODEC_ID_LAGARITH, VIDEO_ES },
#endif #endif
#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT( 52, 117, 0 )
{ VLC_CODEC_MXPEG, CODEC_ID_MXPEG, VIDEO_ES },
#endif
/* Videogames Codecs */ /* Videogames Codecs */
{ VLC_CODEC_INTERPLAY, CODEC_ID_INTERPLAY_VIDEO, VIDEO_ES }, { VLC_CODEC_INTERPLAY, CODEC_ID_INTERPLAY_VIDEO, VIDEO_ES },
......
...@@ -897,6 +897,9 @@ static const entry_t p_list_video[] = { ...@@ -897,6 +897,9 @@ static const entry_t p_list_video[] = {
B(VLC_CODEC_LAGARITH, "Lagarith Lossless"), B(VLC_CODEC_LAGARITH, "Lagarith Lossless"),
A("LAGS"), A("LAGS"),
B(VLC_CODEC_MXPEG, "Mxpeg"),
A("MXPG"),
B(0, "") B(0, "")
}; };
static const entry_t p_list_audio[] = { static const entry_t p_list_audio[] = {
......
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