diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2012-09-05 15:58:11 +0400 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2012-09-05 15:58:11 +0400 |
commit | d5f65e9d40413b88c5d5dcdd1ef9dabdff478116 (patch) | |
tree | 1029442111a2fd3a67d5de9727b6ac8ff1519538 /libavformat/mpegtsenc.c | |
parent | 743a295c09b129df2ead045415e2ecc46affe523 (diff) | |
parent | 124134e42455763b28cc346fed1d07017a76e84e (diff) |
Merge commit '124134e42455763b28cc346fed1d07017a76e84e'
* commit '124134e42455763b28cc346fed1d07017a76e84e':
avopt: Store defaults for AV_OPT_TYPE_CONST in the i64 union member
Conflicts:
libavcodec/aacenc.c
libavcodec/libopenjpegenc.c
libavcodec/options_table.h
libavdevice/bktr.c
libavdevice/v4l2.c
libavdevice/x11grab.c
libavfilter/af_amix.c
libavfilter/vf_drawtext.c
libavformat/movenc.c
libavformat/options_table.h
libavutil/opt.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/mpegtsenc.c')
-rw-r--r-- | libavformat/mpegtsenc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavformat/mpegtsenc.c b/libavformat/mpegtsenc.c index d8e67c7d35..1c0c4c67a4 100644 --- a/libavformat/mpegtsenc.c +++ b/libavformat/mpegtsenc.c @@ -110,10 +110,10 @@ static const AVOption options[] = { { "mpegts_flags", "MPEG-TS muxing flags", offsetof(MpegTSWrite, flags), AV_OPT_TYPE_FLAGS, {.dbl = 0}, 0, INT_MAX, AV_OPT_FLAG_ENCODING_PARAM, "mpegts_flags" }, { "resend_headers", "Reemit PAT/PMT before writing the next packet", - 0, AV_OPT_TYPE_CONST, {.dbl = MPEGTS_FLAG_REEMIT_PAT_PMT}, 0, INT_MAX, + 0, AV_OPT_TYPE_CONST, {.i64 = MPEGTS_FLAG_REEMIT_PAT_PMT}, 0, INT_MAX, AV_OPT_FLAG_ENCODING_PARAM, "mpegts_flags"}, { "latm", "Use LATM packetization for AAC", - 0, AV_OPT_TYPE_CONST, {.dbl = MPEGTS_FLAG_AAC_LATM}, 0, INT_MAX, + 0, AV_OPT_TYPE_CONST, {.i64 = MPEGTS_FLAG_AAC_LATM}, 0, INT_MAX, AV_OPT_FLAG_ENCODING_PARAM, "mpegts_flags"}, // backward compatibility { "resend_headers", "Reemit PAT/PMT before writing the next packet", |