diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2012-09-05 16:09:09 +0400 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2012-09-05 16:09:09 +0400 |
commit | 99de3df3d321715572a4017806d222e35f3f6ac6 (patch) | |
tree | c938e894566c8cdcf218e1ea29ef56eb451f4662 /libavdevice/libcdio.c | |
parent | d5f65e9d40413b88c5d5dcdd1ef9dabdff478116 (diff) | |
parent | d58dd4b5b5d31cfd4092e38a5f2c894eee2ab078 (diff) |
Merge commit 'd58dd4b5b5d31cfd4092e38a5f2c894eee2ab078'
* commit 'd58dd4b5b5d31cfd4092e38a5f2c894eee2ab078':
avopt: Store defaults for AV_OPT_TYPE_FLAGS in the i64 union member
Conflicts:
libavcodec/libvpxenc.c
libavcodec/options_table.h
libavfilter/vf_drawtext.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavdevice/libcdio.c')
-rw-r--r-- | libavdevice/libcdio.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavdevice/libcdio.c b/libavdevice/libcdio.c index 0c3060ac52..e3109193ef 100644 --- a/libavdevice/libcdio.c +++ b/libavdevice/libcdio.c @@ -161,7 +161,7 @@ static int read_seek(AVFormatContext *ctx, int stream_index, int64_t timestamp, #define DEC AV_OPT_FLAG_DECODING_PARAM static const AVOption options[] = { { "speed", "Drive reading speed.", OFFSET(speed), AV_OPT_TYPE_INT, { 0 }, 0, INT_MAX, DEC }, - { "paranoia_mode", "Error recovery mode.", OFFSET(paranoia_mode), AV_OPT_TYPE_FLAGS, { 0 }, INT_MIN, INT_MAX, DEC, "paranoia_mode" }, + { "paranoia_mode", "Error recovery mode.", OFFSET(paranoia_mode), AV_OPT_TYPE_FLAGS, { .i64 = 0 }, INT_MIN, INT_MAX, DEC, "paranoia_mode" }, { "verify", "Verify data integrity in overlap area", 0, AV_OPT_TYPE_CONST, { .i64 = PARANOIA_MODE_VERIFY }, 0, 0, DEC, "paranoia_mode" }, { "overlap", "Perform overlapped reads.", 0, AV_OPT_TYPE_CONST, { .i64 = PARANOIA_MODE_OVERLAP }, 0, 0, DEC, "paranoia_mode" }, { "neverskip", "Do not skip failed reads.", 0, AV_OPT_TYPE_CONST, { .i64 = PARANOIA_MODE_NEVERSKIP }, 0, 0, DEC, "paranoia_mode" }, |