diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2012-09-05 16:26:01 +0400 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2012-09-05 16:33:32 +0400 |
commit | d46c1c72e4f4e1e0b0659a1ab0f57f7092c638f8 (patch) | |
tree | 542a10ecd4b4cb18456e4dec031c6ace69541d0c /libavcodec/g723_1.c | |
parent | 99de3df3d321715572a4017806d222e35f3f6ac6 (diff) | |
parent | e6153f173a49e5bfa70b0c04d2f82930533597b9 (diff) |
Merge commit 'e6153f173a49e5bfa70b0c04d2f82930533597b9'
* commit 'e6153f173a49e5bfa70b0c04d2f82930533597b9':
avopt: Store defaults for AV_OPT_TYPE_INT in the i64 union member
Conflicts:
libavcodec/libopenjpegdec.c
libavcodec/libopenjpegenc.c
libavcodec/libx264.c
libavcodec/mpeg12enc.c
libavcodec/options_table.h
libavcodec/snowenc.c
libavcodec/tiffenc.c
libavdevice/v4l2.c
libavdevice/x11grab.c
libavfilter/af_amix.c
libavfilter/af_asyncts.c
libavfilter/af_join.c
libavfilter/buffersrc.c
libavfilter/src_movie.c
libavfilter/vf_delogo.c
libavfilter/vf_drawtext.c
libavformat/http.c
libavformat/img2dec.c
libavformat/img2enc.c
libavformat/movenc.c
libavformat/mpegenc.c
libavformat/mpegtsenc.c
libavformat/options_table.h
libavformat/segment.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/g723_1.c')
-rw-r--r-- | libavcodec/g723_1.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/g723_1.c b/libavcodec/g723_1.c index b93d5e98c3..52a75056ab 100644 --- a/libavcodec/g723_1.c +++ b/libavcodec/g723_1.c @@ -1321,7 +1321,7 @@ static int g723_1_decode_frame(AVCodecContext *avctx, void *data, static const AVOption options[] = { { "postfilter", "postfilter on/off", OFFSET(postfilter), AV_OPT_TYPE_INT, - { 1 }, 0, 1, AD }, + { .i64 = 1 }, 0, 1, AD }, { NULL } }; |