diff options
| author | Peter Ross <pross@xvid.org> | 2008-08-29 03:52:10 +0000 |
|---|---|---|
| committer | Peter Ross <pross@xvid.org> | 2008-08-29 03:52:10 +0000 |
| commit | 46a73068a600024ca9387fa00ed4ad5d4067d237 (patch) | |
| tree | 526bac7e60216d4407439e872514da6ef944223d | |
| parent | f0aaa16fdfdcfc54418c5f2fce5ea2e693309c8d (diff) | |
| download | ffmpeg-46a73068a600024ca9387fa00ed4ad5d4067d237.tar.gz | |
Change AVCodecContext.bits_per_sample to bits_per_coded_sample.
Nb: This change will become active on the next libavcodec major version bump.
Originally committed as revision 15016 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavcodec/avcodec.h | 4 | ||||
| -rw-r--r-- | libavcodec/utils.c | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 6691089e1f..b8eef3de25 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -1430,7 +1430,11 @@ typedef struct AVCodecContext { * - encoding: Set by libavcodec. * - decoding: Set by user. */ +#if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0) int bits_per_sample; +#else + int bits_per_coded_sample; +#endif /** * prediction method (needed for huffyuv) diff --git a/libavcodec/utils.c b/libavcodec/utils.c index fa5bf1a894..83c4de2261 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -568,7 +568,11 @@ static const AVOption options[]={ {"ec", "set error concealment strategy", OFFSET(error_concealment), FF_OPT_TYPE_FLAGS, 3, INT_MIN, INT_MAX, V|D, "ec"}, {"guess_mvs", "iterative motion vector (MV) search (slow)", 0, FF_OPT_TYPE_CONST, FF_EC_GUESS_MVS, INT_MIN, INT_MAX, V|D, "ec"}, {"deblock", "use strong deblock filter for damaged MBs", 0, FF_OPT_TYPE_CONST, FF_EC_DEBLOCK, INT_MIN, INT_MAX, V|D, "ec"}, +#if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0) {"bits_per_sample", NULL, OFFSET(bits_per_sample), FF_OPT_TYPE_INT, DEFAULT, INT_MIN, INT_MAX}, +#else +{"bits_per_coded_sample", NULL, OFFSET(bits_per_coded_sample), FF_OPT_TYPE_INT, DEFAULT, INT_MIN, INT_MAX}, +#endif {"pred", "prediction method", OFFSET(prediction_method), FF_OPT_TYPE_INT, DEFAULT, INT_MIN, INT_MAX, V|E, "pred"}, {"left", NULL, 0, FF_OPT_TYPE_CONST, FF_PRED_LEFT, INT_MIN, INT_MAX, V|E, "pred"}, {"plane", NULL, 0, FF_OPT_TYPE_CONST, FF_PRED_PLANE, INT_MIN, INT_MAX, V|E, "pred"}, |