diff options
| author | Aurelien Jacobs <aurel@gnuage.org> | 2010-09-30 20:31:42 +0000 |
|---|---|---|
| committer | Aurelien Jacobs <aurel@gnuage.org> | 2010-09-30 20:31:42 +0000 |
| commit | 0743de4ffd063d17df7a66aa579746c4f427ae1a (patch) | |
| tree | aeff42d60301faae08ef4c5dd8c8791ce45df467 | |
| parent | ab3efd0077a5b81b71819c3a792bb0bc59b9d60d (diff) | |
| download | ffmpeg-0743de4ffd063d17df7a66aa579746c4f427ae1a.tar.gz | |
add FF_API_USE_LPC define to disable the deprecated AVCodecContext.use_lpc field
Originally committed as revision 25275 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavcodec/avcodec.h | 5 | ||||
| -rw-r--r-- | libavcodec/flacenc.c | 2 | ||||
| -rw-r--r-- | libavcodec/options.c | 2 |
3 files changed, 6 insertions, 3 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index e2e4d9dbd6..f4b2569d11 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -66,6 +66,9 @@ #ifndef FF_API_SUBTITLE_OLD #define FF_API_SUBTITLE_OLD (LIBAVCODEC_VERSION_MAJOR < 53) #endif +#ifndef FF_API_USE_LPC +#define FF_API_USE_LPC (LIBAVCODEC_VERSION_MAJOR < 53) +#endif #define AV_NOPTS_VALUE INT64_C(0x8000000000000000) #define AV_TIME_BASE 1000000 @@ -2453,7 +2456,7 @@ typedef struct AVCodecContext { int compression_level; #define FF_COMPRESSION_DEFAULT -1 -#if LIBAVCODEC_VERSION_MAJOR < 53 +#if FF_API_USE_LPC /** * Sets whether to use LPC mode - used by FLAC encoder. * - encoding: Set by user. diff --git a/libavcodec/flacenc.c b/libavcodec/flacenc.c index 60cab8ed8f..824e639945 100644 --- a/libavcodec/flacenc.c +++ b/libavcodec/flacenc.c @@ -288,7 +288,7 @@ static av_cold int flac_encode_init(AVCodecContext *avctx) s->options.max_partition_order = ((int[]){ 2, 2, 3, 3, 3, 8, 8, 8, 8, 8, 8, 8, 8})[level]; /* set compression option overrides from AVCodecContext */ -#if LIBAVCODEC_VERSION_MAJOR < 53 +#if FF_API_USE_LPC /* for compatibility with deprecated AVCodecContext.use_lpc */ if (avctx->use_lpc == 0) { s->options.lpc_type = AV_LPC_TYPE_FIXED; diff --git a/libavcodec/options.c b/libavcodec/options.c index 6a6ac78e28..e56ad44415 100644 --- a/libavcodec/options.c +++ b/libavcodec/options.c @@ -382,7 +382,7 @@ static const AVOption options[]={ {"ivlc", "intra vlc table", 0, FF_OPT_TYPE_CONST, CODEC_FLAG2_INTRA_VLC, INT_MIN, INT_MAX, V|E, "flags2"}, {"b_sensitivity", "adjusts sensitivity of b_frame_strategy 1", OFFSET(b_sensitivity), FF_OPT_TYPE_INT, 40, 1, INT_MAX, V|E}, {"compression_level", NULL, OFFSET(compression_level), FF_OPT_TYPE_INT, FF_COMPRESSION_DEFAULT, INT_MIN, INT_MAX, V|A|E}, -#if LIBAVCODEC_VERSION_MAJOR < 53 +#if FF_API_USE_LPC {"use_lpc", "sets whether to use LPC mode (FLAC)", OFFSET(use_lpc), FF_OPT_TYPE_INT, -1, INT_MIN, INT_MAX, A|E}, #endif {"lpc_coeff_precision", "LPC coefficient precision (FLAC)", OFFSET(lpc_coeff_precision), FF_OPT_TYPE_INT, DEFAULT, 0, INT_MAX, A|E}, |