vlc | branch: master | Sébastien Escudier <[email protected]> | Fri Feb 10 15:14:26 2012 +0100| [a6fdd02e3b952dc2f66469cc4bd5e0b7ec1116f4] | committer: Sébastien Escudier
Support of Mxpeg codec > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=a6fdd02e3b952dc2f66469cc4bd5e0b7ec1116f4 --- include/vlc_fourcc.h | 1 + modules/codec/avcodec/fourcc.c | 4 ++++ src/misc/fourcc.c | 3 +++ 3 files changed, 8 insertions(+), 0 deletions(-) diff --git a/include/vlc_fourcc.h b/include/vlc_fourcc.h index 7e1d6ba..96747be 100644 --- a/include/vlc_fourcc.h +++ b/include/vlc_fourcc.h @@ -120,6 +120,7 @@ #define VLC_CODEC_LAGARITH VLC_FOURCC('L','A','G','S') #define VLC_CODEC_FLASHSV2 VLC_FOURCC('F','S','V','2') #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 */ #define VLC_CODEC_YV9 VLC_FOURCC('Y','V','U','9') diff --git a/modules/codec/avcodec/fourcc.c b/modules/codec/avcodec/fourcc.c index 17eb87a..b352d1d 100644 --- a/modules/codec/avcodec/fourcc.c +++ b/modules/codec/avcodec/fourcc.c @@ -206,6 +206,10 @@ static const struct { VLC_CODEC_LAGARITH, CODEC_ID_LAGARITH, VIDEO_ES }, #endif +#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT( 52, 117, 0 ) + { VLC_CODEC_MXPEG, CODEC_ID_MXPEG, VIDEO_ES }, +#endif + /* Videogames Codecs */ { VLC_CODEC_INTERPLAY, CODEC_ID_INTERPLAY_VIDEO, VIDEO_ES }, diff --git a/src/misc/fourcc.c b/src/misc/fourcc.c index 4f405b9..b2d8c95 100644 --- a/src/misc/fourcc.c +++ b/src/misc/fourcc.c @@ -901,6 +901,9 @@ static const entry_t p_list_video[] = { B(VLC_CODEC_LAGARITH, "Lagarith Lossless"), A("LAGS"), + B(VLC_CODEC_MXPEG, "Mxpeg"), + A("MXPG"), + B(0, "") }; static const entry_t p_list_audio[] = { _______________________________________________ vlc-commits mailing list [email protected] http://mailman.videolan.org/listinfo/vlc-commits
