From 243df1351d2d928caa084a5704ed783f0b83f072 Mon Sep 17 00:00:00 2001 From: Vittorio Giovara Date: Sun, 13 Sep 2015 23:45:24 +0200 Subject: lavc: Move {min,max}_prediction_order to codec private options These options are only used by alac and flac. They are very codec-specific options, so deprecate the global variants. Signed-off-by: Vittorio Giovara --- libavcodec/avcodec.h | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) (limited to 'libavcodec/avcodec.h') diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index de367de390..e997129194 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -2386,19 +2386,15 @@ typedef struct AVCodecContext { */ int trellis; - /** - * - encoding: Set by user. - * - decoding: unused - */ +#if FF_API_PRIVATE_OPT + /** @deprecated use encoder private options instead */ + attribute_deprecated int min_prediction_order; - /** - * - encoding: Set by user. - * - decoding: unused - */ + /** @deprecated use encoder private options instead */ + attribute_deprecated int max_prediction_order; -#if FF_API_PRIVATE_OPT /** @deprecated use encoder private options instead */ attribute_deprecated int64_t timecode_frame_start; -- cgit v1.2.3