diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-10-28 13:21:07 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-10-28 13:21:17 +0100 |
| commit | 683ab5fec9942ca2ba2b060dcd0794a362cb2545 (patch) | |
| tree | d5cecf1c7043a356a56d7ffaa942ed602b7d718a /libavcodec/g722dec.c | |
| parent | 054e4bab83b789a4f958d6d8f56418e34c279e4b (diff) | |
| parent | f2521563d1a0c3e2a21892f59f3327b82b3db7fc (diff) | |
Merge commit 'f2521563d1a0c3e2a21892f59f3327b82b3db7fc'
* commit 'f2521563d1a0c3e2a21892f59f3327b82b3db7fc':
g722dec: Change bits_per_codeword to the right option type
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/g722dec.c')
| -rw-r--r-- | libavcodec/g722dec.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/g722dec.c b/libavcodec/g722dec.c index d3b89fffc5..470fbbfff7 100644 --- 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 } }; |