* 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>
{"dsurex_mode","Dolby Surround EX Mode",OFFSET(dolby_surround_ex_mode),AV_OPT_TYPE_INT,{.dbl=AC3ENC_OPT_NONE},AC3ENC_OPT_NONE,AC3ENC_OPT_MODE_ON,AC3ENC_PARAM,"dsurex_mode"},
{"lpc_passes","Number of passes to use for Cholesky factorization during LPC analysis",offsetof(FlacEncodeContext,options.lpc_passes),AV_OPT_TYPE_INT,{.dbl=-1},INT_MIN,INT_MAX,FLAGS},
{"eld_sbr","Enable SBR for ELD (for SBR in other configurations, use the -profile parameter)",offsetof(AACContext,eld_sbr),AV_OPT_TYPE_INT,{0},0,1,AV_OPT_FLAG_AUDIO_PARAM|AV_OPT_FLAG_ENCODING_PARAM},
{"default","Choose signaling implicitly (explicit hierarchical by default, implicit if global header is disabled)",0,AV_OPT_TYPE_CONST,{-1},0,0,AV_OPT_FLAG_AUDIO_PARAM|AV_OPT_FLAG_ENCODING_PARAM,"signaling"},
{"default","Choose signaling implicitly (explicit hierarchical by default, implicit if global header is disabled)",0,AV_OPT_TYPE_CONST,{.i64=-1},0,0,AV_OPT_FLAG_AUDIO_PARAM|AV_OPT_FLAG_ENCODING_PARAM,"signaling"},
{"header_period","StreamMuxConfig and PCE repetition period (in frames)",offsetof(AACContext,header_period),AV_OPT_TYPE_INT,{0},0,0xffff,AV_OPT_FLAG_AUDIO_PARAM|AV_OPT_FLAG_ENCODING_PARAM},
{"mpv_flags","Flags common for all mpegvideo-based encoders.",FF_MPV_OFFSET(mpv_flags),AV_OPT_TYPE_FLAGS,{0},INT_MIN,INT_MAX,FF_MPV_OPT_FLAGS,"mpv_flags"},\
{"global_header","place global headers in extradata instead of every keyframe",0,AV_OPT_TYPE_CONST,{.dbl=CODEC_FLAG_GLOBAL_HEADER},INT_MIN,INT_MAX,V|A|E,"flags"},
{"bitexact","use only bitexact stuff (except (i)dct)",0,AV_OPT_TYPE_CONST,{.dbl=CODEC_FLAG_BITEXACT},INT_MIN,INT_MAX,A|V|S|D|E,"flags"},
{"aic","h263 advanced intra coding / mpeg4 ac prediction",0,AV_OPT_TYPE_CONST,{.dbl=CODEC_FLAG_AC_PRED},INT_MIN,INT_MAX,V|E,"flags"},
{"mv4","use four motion vector by macroblock (mpeg4)",0,AV_OPT_TYPE_CONST,{.i64=CODEC_FLAG_4MV},INT_MIN,INT_MAX,V|E,"flags"},
{"qpel","use 1/4 pel motion compensation",0,AV_OPT_TYPE_CONST,{.i64=CODEC_FLAG_QPEL},INT_MIN,INT_MAX,V|E,"flags"},
{"global_header","place global headers in extradata instead of every keyframe",0,AV_OPT_TYPE_CONST,{.i64=CODEC_FLAG_GLOBAL_HEADER},INT_MIN,INT_MAX,V|A|E,"flags"},
{"bitexact","use only bitexact stuff (except (i)dct)",0,AV_OPT_TYPE_CONST,{.i64=CODEC_FLAG_BITEXACT},INT_MIN,INT_MAX,A|V|S|D|E,"flags"},
{"aic","h263 advanced intra coding / mpeg4 ac prediction",0,AV_OPT_TYPE_CONST,{.i64=CODEC_FLAG_AC_PRED},INT_MIN,INT_MAX,V|E,"flags"},
#if FF_API_MPV_GLOBAL_OPTS
{"cbp","Deprecated, use mpegvideo private options instead",0,AV_OPT_TYPE_CONST,{.dbl=CODEC_FLAG_CBP_RD},INT_MIN,INT_MAX,V|E,"flags"},
{"qprd","Deprecated, use mpegvideo private options instead",0,AV_OPT_TYPE_CONST,{.dbl=CODEC_FLAG_QP_RD},INT_MIN,INT_MAX,V|E,"flags"},
{"cbp","Deprecated, use mpegvideo private options instead",0,AV_OPT_TYPE_CONST,{.i64=CODEC_FLAG_CBP_RD},INT_MIN,INT_MAX,V|E,"flags"},
{"qprd","Deprecated, use mpegvideo private options instead",0,AV_OPT_TYPE_CONST,{.i64=CODEC_FLAG_QP_RD},INT_MIN,INT_MAX,V|E,"flags"},
{"local_header","place global headers at every keyframe instead of in extradata",0,AV_OPT_TYPE_CONST,{.dbl=CODEC_FLAG2_LOCAL_HEADER},INT_MIN,INT_MAX,V|E,"flags2"},
{"chunks","Frame data might be split into multiple chunks",0,AV_OPT_TYPE_CONST,{.dbl=CODEC_FLAG2_CHUNKS},INT_MIN,INT_MAX,V|D,"flags2"},
{"showall","Show all frames before the first keyframe",0,AV_OPT_TYPE_CONST,{.dbl=CODEC_FLAG2_SHOW_ALL},INT_MIN,INT_MAX,V|D,"flags2"},
{"local_header","place global headers at every keyframe instead of in extradata",0,AV_OPT_TYPE_CONST,{.i64=CODEC_FLAG2_LOCAL_HEADER},INT_MIN,INT_MAX,V|E,"flags2"},
{"chunks","Frame data might be split into multiple chunks",0,AV_OPT_TYPE_CONST,{.i64=CODEC_FLAG2_CHUNKS},INT_MIN,INT_MAX,V|D,"flags2"},
{"showall","Show all frames before the first keyframe",0,AV_OPT_TYPE_CONST,{.i64=CODEC_FLAG2_SHOW_ALL},INT_MIN,INT_MAX,V|D,"flags2"},
{"direct_blocksize","direct-qpel-blocksize bug (autodetected per fourcc/version)",0,AV_OPT_TYPE_CONST,{.dbl=FF_BUG_DIRECT_BLOCKSIZE},INT_MIN,INT_MAX,V|D,"bug"},
{"edge","edge padding bug (autodetected per fourcc/version)",0,AV_OPT_TYPE_CONST,{.dbl=FF_BUG_EDGE},INT_MIN,INT_MAX,V|D,"bug"},
{"direct_blocksize","direct-qpel-blocksize bug (autodetected per fourcc/version)",0,AV_OPT_TYPE_CONST,{.i64=FF_BUG_DIRECT_BLOCKSIZE},INT_MIN,INT_MAX,V|D,"bug"},
{"edge","edge padding bug (autodetected per fourcc/version)",0,AV_OPT_TYPE_CONST,{.i64=FF_BUG_EDGE},INT_MIN,INT_MAX,V|D,"bug"},
{"lelim","single coefficient elimination threshold for luminance (negative values also consider dc coefficient)",OFFSET(luma_elim_threshold),AV_OPT_TYPE_INT,{.dbl=DEFAULT},INT_MIN,INT_MAX,V|E},
{"celim","single coefficient elimination threshold for chrominance (negative values also consider dc coefficient)",OFFSET(chroma_elim_threshold),AV_OPT_TYPE_INT,{.dbl=DEFAULT},INT_MIN,INT_MAX,V|E},
#endif
{"strict","how strictly to follow the standards",OFFSET(strict_std_compliance),AV_OPT_TYPE_INT,{.dbl=DEFAULT},INT_MIN,INT_MAX,A|V|D|E,"strict"},
{"very","strictly conform to a older more strict version of the spec or reference software",0,AV_OPT_TYPE_CONST,{.dbl=FF_COMPLIANCE_VERY_STRICT},INT_MIN,INT_MAX,V|D|E,"strict"},
{"strict","strictly conform to all the things in the spec no matter what consequences",0,AV_OPT_TYPE_CONST,{.dbl=FF_COMPLIANCE_STRICT},INT_MIN,INT_MAX,V|D|E,"strict"},
{"experimental","allow non standardized experimental things",0,AV_OPT_TYPE_CONST,{.dbl=FF_COMPLIANCE_EXPERIMENTAL},INT_MIN,INT_MAX,V|D|E,"strict"},
{"very","strictly conform to a older more strict version of the spec or reference software",0,AV_OPT_TYPE_CONST,{.i64=FF_COMPLIANCE_VERY_STRICT},INT_MIN,INT_MAX,V|D|E,"strict"},
{"strict","strictly conform to all the things in the spec no matter what consequences",0,AV_OPT_TYPE_CONST,{.i64=FF_COMPLIANCE_STRICT},INT_MIN,INT_MAX,V|D|E,"strict"},
{"explode","abort decoding on minor error detection",0,AV_OPT_TYPE_CONST,{.dbl=AV_EF_EXPLODE},INT_MIN,INT_MAX,A|V|D,"err_detect"},
{"careful","consider things that violate the spec and have not been seen in the wild as errors",0,AV_OPT_TYPE_CONST,{.dbl=AV_EF_CAREFUL},INT_MIN,INT_MAX,A|V|D,"err_detect"},
{"compliant","consider all spec non compliancies as errors",0,AV_OPT_TYPE_CONST,{.dbl=AV_EF_COMPLIANT},INT_MIN,INT_MAX,A|V|D,"err_detect"},
{"aggressive","consider things that a sane encoder should not do as an error",0,AV_OPT_TYPE_CONST,{.dbl=AV_EF_AGGRESSIVE},INT_MIN,INT_MAX,A|V|D,"err_detect"},
{"explode","abort decoding on minor error detection",0,AV_OPT_TYPE_CONST,{.i64=AV_EF_EXPLODE},INT_MIN,INT_MAX,A|V|D,"err_detect"},
{"careful","consider things that violate the spec and have not been seen in the wild as errors",0,AV_OPT_TYPE_CONST,{.i64=AV_EF_CAREFUL},INT_MIN,INT_MAX,A|V|D,"err_detect"},
{"compliant","consider all spec non compliancies as errors",0,AV_OPT_TYPE_CONST,{.i64=AV_EF_COMPLIANT},INT_MIN,INT_MAX,A|V|D,"err_detect"},
{"aggressive","consider things that a sane encoder should not do as an error",0,AV_OPT_TYPE_CONST,{.i64=AV_EF_AGGRESSIVE},INT_MIN,INT_MAX,A|V|D,"err_detect"},
{"audio_service_type","audio service type",OFFSET(audio_service_type),AV_OPT_TYPE_INT,{.dbl=AV_AUDIO_SERVICE_TYPE_MAIN},0,AV_AUDIO_SERVICE_TYPE_NB-1,A|E,"audio_service_type"},
{"request_sample_fmt","sample format audio decoders should prefer",OFFSET(request_sample_fmt),AV_OPT_TYPE_INT,{.dbl=AV_SAMPLE_FMT_NONE},AV_SAMPLE_FMT_NONE,AV_SAMPLE_FMT_NB-1,A|D,"request_sample_fmt"},
{"video_device_number","set video device number for devices with same name (starts at 0)",OFFSET(video_device_number),AV_OPT_TYPE_INT,{.dbl=0},0,INT_MAX,DEC},
{"audio_device_number","set audio device number for devices with same name (starts at 0)",OFFSET(audio_device_number),AV_OPT_TYPE_INT,{.dbl=0},0,INT_MAX,DEC},
{"audio_buffer_size","set audio device buffer latency size in milliseconds (default is the device's default)",OFFSET(audio_buffer_size),AV_OPT_TYPE_INT,{.dbl=0},0,INT_MAX,DEC},
@ -440,9 +440,9 @@ static int iec61883_close(AVFormatContext *context)
staticconstAVOptionoptions[]={
{"dvtype","override autodetection of DV/HDV",offsetof(structiec61883_data,type),AV_OPT_TYPE_INT,{.dbl=IEC61883_AUTO},IEC61883_AUTO,IEC61883_HDV,AV_OPT_FLAG_DECODING_PARAM,"dvtype"},
{"ft_load_flags","set font loading flags for libfreetype",OFFSET(ft_load_flags),AV_OPT_TYPE_FLAGS,{.dbl=FT_LOAD_DEFAULT|FT_LOAD_RENDER},0,INT_MAX,FLAGS,"ft_load_flags"},
{"rtphint","Add RTP hint tracks",0,AV_OPT_TYPE_CONST,{.dbl=FF_MOV_FLAG_RTP_HINT},INT_MIN,INT_MAX,AV_OPT_FLAG_ENCODING_PARAM,"movflags"},
{"rtphint","Add RTP hint tracks",0,AV_OPT_TYPE_CONST,{.i64=FF_MOV_FLAG_RTP_HINT},INT_MIN,INT_MAX,AV_OPT_FLAG_ENCODING_PARAM,"movflags"},
{"moov_size","maximum moov size so it can be placed at the begin",offsetof(MOVMuxContext,reserved_moov_size),AV_OPT_TYPE_INT,{.dbl=0},0,INT_MAX,AV_OPT_FLAG_ENCODING_PARAM,0},
{"empty_moov","Make the initial moov atom empty (not supported by QuickTime)",0,AV_OPT_TYPE_CONST,{.dbl=FF_MOV_FLAG_EMPTY_MOOV},INT_MIN,INT_MAX,AV_OPT_FLAG_ENCODING_PARAM,"movflags"},
{"frag_keyframe","Fragment at video keyframes",0,AV_OPT_TYPE_CONST,{.dbl=FF_MOV_FLAG_FRAG_KEYFRAME},INT_MIN,INT_MAX,AV_OPT_FLAG_ENCODING_PARAM,"movflags"},
{"separate_moof","Write separate moof/mdat atoms for each track",0,AV_OPT_TYPE_CONST,{.dbl=FF_MOV_FLAG_SEPARATE_MOOF},INT_MIN,INT_MAX,AV_OPT_FLAG_ENCODING_PARAM,"movflags"},
{"frag_custom","Flush fragments on caller requests",0,AV_OPT_TYPE_CONST,{.dbl=FF_MOV_FLAG_FRAG_CUSTOM},INT_MIN,INT_MAX,AV_OPT_FLAG_ENCODING_PARAM,"movflags"},
{"isml","Create a live smooth streaming feed (for pushing to a publishing point)",0,AV_OPT_TYPE_CONST,{.dbl=FF_MOV_FLAG_ISML},INT_MIN,INT_MAX,AV_OPT_FLAG_ENCODING_PARAM,"movflags"},
{"empty_moov","Make the initial moov atom empty (not supported by QuickTime)",0,AV_OPT_TYPE_CONST,{.i64=FF_MOV_FLAG_EMPTY_MOOV},INT_MIN,INT_MAX,AV_OPT_FLAG_ENCODING_PARAM,"movflags"},
{"frag_keyframe","Fragment at video keyframes",0,AV_OPT_TYPE_CONST,{.i64=FF_MOV_FLAG_FRAG_KEYFRAME},INT_MIN,INT_MAX,AV_OPT_FLAG_ENCODING_PARAM,"movflags"},
{"separate_moof","Write separate moof/mdat atoms for each track",0,AV_OPT_TYPE_CONST,{.i64=FF_MOV_FLAG_SEPARATE_MOOF},INT_MIN,INT_MAX,AV_OPT_FLAG_ENCODING_PARAM,"movflags"},
{"frag_custom","Flush fragments on caller requests",0,AV_OPT_TYPE_CONST,{.i64=FF_MOV_FLAG_FRAG_CUSTOM},INT_MIN,INT_MAX,AV_OPT_FLAG_ENCODING_PARAM,"movflags"},
{"isml","Create a live smooth streaming feed (for pushing to a publishing point)",0,AV_OPT_TYPE_CONST,{.i64=FF_MOV_FLAG_ISML},INT_MIN,INT_MAX,AV_OPT_FLAG_ENCODING_PARAM,"movflags"},
{"nobuffer","reduce the latency introduced by optional buffering",0,AV_OPT_TYPE_CONST,{.i64=AVFMT_FLAG_NOBUFFER},0,INT_MAX,D,"fflags"},
{"analyzeduration","how many microseconds are analyzed to estimate duration",OFFSET(max_analyze_duration),AV_OPT_TYPE_INT,{.dbl=5*AV_TIME_BASE},0,INT_MAX,D},
{"indexmem","max memory used for timestamp index (per stream)",OFFSET(max_index_size),AV_OPT_TYPE_INT,{.dbl=1<<20},0,INT_MAX,D},
{"rtbufsize","max memory used for buffering real-time frames",OFFSET(max_picture_buffer),AV_OPT_TYPE_INT,{.dbl=3041280},0,INT_MAX,D},/* defaults to 1s of 15fps 352x288 YUYV422 video */
{"fdebug","print specific debug info",OFFSET(debug),AV_OPT_TYPE_FLAGS,{.dbl=DEFAULT},0,INT_MAX,E|D,"fdebug"},
{"f_err_detect","set error detection flags (deprecated; use err_detect, save via avconv)",OFFSET(error_recognition),AV_OPT_TYPE_FLAGS,{.dbl=AV_EF_CRCCHECK},INT_MIN,INT_MAX,D,"err_detect"},
{"explode","abort decoding on minor error detection",0,AV_OPT_TYPE_CONST,{.dbl=AV_EF_EXPLODE},INT_MIN,INT_MAX,D,"err_detect"},
{"careful","consider things that violate the spec and have not been seen in the wild as errors",0,AV_OPT_TYPE_CONST,{.dbl=AV_EF_CAREFUL},INT_MIN,INT_MAX,D,"err_detect"},
{"compliant","consider all spec non compliancies as errors",0,AV_OPT_TYPE_CONST,{.dbl=AV_EF_COMPLIANT},INT_MIN,INT_MAX,D,"err_detect"},
{"aggressive","consider things that a sane encoder shouldnt do as an error",0,AV_OPT_TYPE_CONST,{.dbl=AV_EF_AGGRESSIVE},INT_MIN,INT_MAX,D,"err_detect"},
{"explode","abort decoding on minor error detection",0,AV_OPT_TYPE_CONST,{.i64=AV_EF_EXPLODE},INT_MIN,INT_MAX,D,"err_detect"},
{"careful","consider things that violate the spec and have not been seen in the wild as errors",0,AV_OPT_TYPE_CONST,{.i64=AV_EF_CAREFUL},INT_MIN,INT_MAX,D,"err_detect"},
{"compliant","consider all spec non compliancies as errors",0,AV_OPT_TYPE_CONST,{.i64=AV_EF_COMPLIANT},INT_MIN,INT_MAX,D,"err_detect"},
{"aggressive","consider things that a sane encoder shouldnt do as an error",0,AV_OPT_TYPE_CONST,{.i64=AV_EF_AGGRESSIVE},INT_MIN,INT_MAX,D,"err_detect"},
{"use_wallclock_as_timestamps","use wallclock as timestamps",OFFSET(use_wallclock_as_timestamps),AV_OPT_TYPE_INT,{.dbl=0},0,INT_MAX-1,D},
{"rtmp_pageurl","URL of the web page in which the media was embedded. By default no value will be sent.",OFFSET(pageurl),AV_OPT_TYPE_STRING,{.str=NULL},0,0,DEC},
{"rtmp_playpath","Stream identifier to play or to publish",OFFSET(playpath),AV_OPT_TYPE_STRING,{.str=NULL},0,0,DEC|ENC},
{"rtmp_subscribe","Name of live stream to subscribe to. Defaults to rtmp_playpath.",OFFSET(subscribe),AV_OPT_TYPE_STRING,{.str=NULL},0,0,DEC},
{"latm","Use MP4A-LATM packetization instead of MPEG4-GENERIC for AAC",0,AV_OPT_TYPE_CONST,{.dbl=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,{.dbl=FF_RTP_FLAG_RFC2190},INT_MIN,INT_MAX,AV_OPT_FLAG_ENCODING_PARAM,"rtpflags"}, \
{"h264_mode0","Use mode 0 for H264 in RTP",0,AV_OPT_TYPE_CONST,{.dbl=FF_RTP_FLAG_H264_MODE0},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"}, \
{"be","output in big-endian format (for use as s16be)",0,AV_OPT_TYPE_CONST,{.dbl=SPDIF_FLAG_BIGENDIAN},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},
Michael Niedermayer
13 years ago