Merge commit 'f2521563d1a0c3e2a21892f59f3327b82b3db7fc'

* commit 'f2521563d1a0c3e2a21892f59f3327b82b3db7fc': g722dec: Change bits_per_codeword to the right option type Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago · 683ab5fec9
parent 054e4bab83 f2521563d1
commit 683ab5fec9
1 changed files with 1 additions and 1 deletions
--- a/libavcodec/g722dec.c
+++ b/libavcodec/g722dec.c
@ -44,7 +44,7 @@
 #define OFFSET(x) offsetof(G722Context, x)
 #define AD AV_OPT_FLAG_AUDIO_PARAM | AV_OPT_FLAG_DECODING_PARAM
 static const AVOption options[] = {
-    { "bits_per_codeword", "Bits per G722 codeword", OFFSET(bits_per_codeword), AV_OPT_TYPE_FLAGS, { .i64 = 8 }, 6, 8, AD },
+    { "bits_per_codeword", "Bits per G722 codeword", OFFSET(bits_per_codeword), AV_OPT_TYPE_INT, { .i64 = 8 }, 6, 8, AD },
    { NULL }
 };