Mercurial > libavcodec.hg
changeset 7720:b1cacb2f48a0 libavcodec
Change AVCodecContext.bits_per_sample to bits_per_coded_sample.
Nb: This change will become active on the next libavcodec major version bump.
| author | pross |
|---|---|
| date | Fri, 29 Aug 2008 03:52:10 +0000 |
| parents | 0f7cdf663356 |
| children | 198421b7dbc0 |
| files | avcodec.h utils.c |
| diffstat | 2 files changed, 8 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/avcodec.h Fri Aug 29 00:09:47 2008 +0000 +++ b/avcodec.h Fri Aug 29 03:52:10 2008 +0000 @@ -1430,7 +1430,11 @@ * - 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)
--- a/utils.c Fri Aug 29 00:09:47 2008 +0000 +++ b/utils.c Fri Aug 29 03:52:10 2008 +0000 @@ -568,7 +568,11 @@ {"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"},