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/rtpenc.h | |
parent | d5f65e9d40413b88c5d5dcdd1ef9dabdff478116 (diff) | |
parent | d58dd4b5b5d31cfd4092e38a5f2c894eee2ab078 (diff) | |
download | ffmpeg-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/rtpenc.h')
-rw-r--r-- | libavformat/rtpenc.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/rtpenc.h b/libavformat/rtpenc.h index 77206927df..4b3f5dbc6d 100644 --- a/libavformat/rtpenc.h +++ b/libavformat/rtpenc.h @@ -69,7 +69,7 @@ typedef struct RTPMuxContext RTPMuxContext; #define FF_RTP_FLAG_H264_MODE0 8 #define FF_RTP_FLAG_OPTS(ctx, fieldname) \ - { "rtpflags", "RTP muxer flags", offsetof(ctx, fieldname), AV_OPT_TYPE_FLAGS, {.dbl = 0}, INT_MIN, INT_MAX, AV_OPT_FLAG_ENCODING_PARAM, "rtpflags" }, \ + { "rtpflags", "RTP muxer flags", offsetof(ctx, fieldname), AV_OPT_TYPE_FLAGS, {.i64 = 0}, INT_MIN, INT_MAX, AV_OPT_FLAG_ENCODING_PARAM, "rtpflags" }, \ { "latm", "Use MP4A-LATM packetization instead of MPEG4-GENERIC for AAC", 0, AV_OPT_TYPE_CONST, {.i64 = FF_RTP_FLAG_MP4A_LATM}, INT_MIN, INT_MAX, AV_OPT_FLAG_ENCODING_PARAM, "rtpflags" }, \ { "rfc2190", "Use RFC 2190 packetization instead of RFC 4629 for H.263", 0, AV_OPT_TYPE_CONST, {.i64 = FF_RTP_FLAG_RFC2190}, INT_MIN, INT_MAX, AV_OPT_FLAG_ENCODING_PARAM, "rtpflags" }, \ { "skip_rtcp", "Don't send RTCP sender reports", 0, AV_OPT_TYPE_CONST, {.i64 = FF_RTP_FLAG_SKIP_RTCP}, INT_MIN, INT_MAX, AV_OPT_FLAG_ENCODING_PARAM, "rtpflags" }, \ |