Merge commit '64f7575fbd64e5b65d5c644347408588c776f1fe'

[ffmpeg] / libavcodec / avdct.c

diff --git a/libavcodec/avdct.c b/libavcodec/avdct.c
index a01a6b767a8f448113bb89724c9743ad6894b31d..f92c691adb9d819b26506f089bcff8595625b1f3 100644 (file)
--- a/libavcodec/avdct.c
+++ b/libavcodec/avdct.c
@@ -63,6 +63,8 @@ static const AVOption avdct_options[] = {
 {"xvidmmx", "experimental / for debugging", 0, AV_OPT_TYPE_CONST, {.i64 = FF_IDCT_XVID }, INT_MIN, INT_MAX, V|E|D, "idct"},
 {"faani", "floating point AAN IDCT (experimental / for debugging)", 0, AV_OPT_TYPE_CONST, {.i64 = FF_IDCT_FAAN }, INT_MIN, INT_MAX, V|D|E, "idct"},
 {"simpleauto", "experimental / for debugging", 0, AV_OPT_TYPE_CONST, {.i64 = FF_IDCT_SIMPLEAUTO }, INT_MIN, INT_MAX, V|E|D, "idct"},
+
+{"bits_per_sample", "", OFFSET(bits_per_sample), AV_OPT_TYPE_INT, {.i64 = 8 }, 0, 14, 0,},
 {NULL},
 };
 
@@ -99,6 +101,7 @@ int avcodec_dct_init(AVDCT *dsp)
 
     avctx->idct_algo = dsp->idct_algo;
     avctx->dct_algo  = dsp->dct_algo;
+    avctx->bits_per_raw_sample = dsp->bits_per_sample;
 
 #define COPY(src, name) memcpy(&dsp->name, &src.name, sizeof(dsp->name))