From: Laurent Aimar Date: Wed, 27 Nov 2002 14:44:06 +0000 (+0000) Subject: * ffmpeg: add a LIBAVCODEC_BUILD test for CODEC_ID_MJPEGB X-Git-Tag: 0.5.0~631 X-Git-Url: https://git.videolan.org/gitweb.cgi/vlc.git/?p=vlc.git;p=vlc.git;a=commitdiff_plain;h=e042941f56bfadbe32d8e2014292d61a1b4b5a4d;hp=422dbd4ad0a164ba603a55c9e96ae4b133e33838 * ffmpeg: add a LIBAVCODEC_BUILD test for CODEC_ID_MJPEGB --- diff --git a/modules/codec/ffmpeg/ffmpeg.c b/modules/codec/ffmpeg/ffmpeg.c index 54c40ba61d..ecb57efbd8 100644 --- a/modules/codec/ffmpeg/ffmpeg.c +++ b/modules/codec/ffmpeg/ffmpeg.c @@ -2,7 +2,7 @@ * ffmpeg.c: video decoder using ffmpeg library ***************************************************************************** * Copyright (C) 1999-2001 VideoLAN - * $Id: ffmpeg.c,v 1.18 2002/11/27 12:41:45 fenrir Exp $ + * $Id: ffmpeg.c,v 1.19 2002/11/27 14:44:06 fenrir Exp $ * * Authors: Laurent Aimar * @@ -500,12 +500,14 @@ static int ffmpeg_GetFfmpegCodec( vlc_fourcc_t i_fourcc, i_codec = CODEC_ID_MJPEG; psz_name = "Motion JPEG"; break; +#if LIBAVCODEC_BUILD >= 4640 case FOURCC_mjpb: i_cat = VIDEO_ES; i_codec = CODEC_ID_MJPEGB; psz_name = "Motion JPEG B"; break; - +#endif + #if LIBAVCODEC_BUILD >= 4632 case FOURCC_WMA1: case FOURCC_wma1: