diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-09-05 14:09:09 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-09-05 14:09:09 +0200 |
| commit | 99de3df3d321715572a4017806d222e35f3f6ac6 (patch) | |
| tree | c938e894566c8cdcf218e1ea29ef56eb451f4662 /libavformat/spdifenc.c | |
| parent | d5f65e9d40413b88c5d5dcdd1ef9dabdff478116 (diff) | |
| parent | d58dd4b5b5d31cfd4092e38a5f2c894eee2ab078 (diff) | |
| download | ffmpeg-streaming-99de3df3d321715572a4017806d222e35f3f6ac6.zip ffmpeg-streaming-99de3df3d321715572a4017806d222e35f3f6ac6.tar.gz | |
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 'libavformat/spdifenc.c')
| -rw-r--r-- | libavformat/spdifenc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/spdifenc.c b/libavformat/spdifenc.c index 0406d6b..873e839 100644 --- a/libavformat/spdifenc.c +++ b/libavformat/spdifenc.c @@ -85,7 +85,7 @@ typedef struct IEC61937Context { } IEC61937Context; static const AVOption options[] = { -{ "spdif_flags", "IEC 61937 encapsulation flags", offsetof(IEC61937Context, spdif_flags), AV_OPT_TYPE_FLAGS, {.dbl = 0}, 0, INT_MAX, AV_OPT_FLAG_ENCODING_PARAM, "spdif_flags" }, +{ "spdif_flags", "IEC 61937 encapsulation flags", offsetof(IEC61937Context, spdif_flags), AV_OPT_TYPE_FLAGS, {.i64 = 0}, 0, INT_MAX, AV_OPT_FLAG_ENCODING_PARAM, "spdif_flags" }, { "be", "output in big-endian format (for use as s16be)", 0, AV_OPT_TYPE_CONST, {.i64 = SPDIF_FLAG_BIGENDIAN}, 0, INT_MAX, AV_OPT_FLAG_ENCODING_PARAM, "spdif_flags" }, { "dtshd_rate", "mux complete DTS frames in HD mode at the specified IEC958 rate (in Hz, default 0=disabled)", offsetof(IEC61937Context, dtshd_rate), AV_OPT_TYPE_INT, {.dbl = 0}, 0, 768000, AV_OPT_FLAG_ENCODING_PARAM }, { "dtshd_fallback_time", "min secs to strip HD for after an overflow (-1: till the end, default 60)", offsetof(IEC61937Context, dtshd_fallback), AV_OPT_TYPE_INT, {.dbl = 60}, -1, INT_MAX, AV_OPT_FLAG_ENCODING_PARAM }, |
