summaryrefslogtreecommitdiffstats
path: root/libavcodec/options.c
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-10-201-23/+25
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: presets: rename presets directory lavc: make avcodec_get_context_defaults3 "officially" public lavf: replace av_new_stream->avformat_new_stream part II. lavf,lavd: replace av_new_stream->avformat_new_stream part I. lavf: add avformat_new_stream as a replacement for av_new_stream. Use correct scaling table for bwd-pred MVs in second B-field Ut Video decoder Makefile: change presets extension to .avpreset lavfi: add rgbtestsrc source, ported from MPlayer libmpcodecs lavfi: add testsrc source AVOptions: add documentation. presets: update libx264 ffpresets Conflicts: Changelog doc/APIchanges doc/ffmpeg.texi ffpresets/libx264-ipod320.ffpreset ffpresets/libx264-ipod640.ffpreset ffserver.c libavcodec/avcodec.h libavcodec/options.c libavcodec/version.h libavdevice/libdc1394.c libavfilter/avfilter.h libavfilter/vsrc_testsrc.c libavformat/flvdec.c libavformat/riff.c libavformat/version.h libavformat/wtv.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavc: make avcodec_get_context_defaults3 "officially" publicAnton Khirnov2011-10-191-20/+20
| | | | | | | | Deprecate avcodec_get_context_defaults/avcodec_get_context_defaults2
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-10-141-2/+2
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: proresdsp: fix function prototypes. prores-idct: fix overflow in c code. fate: update prores-alpha ref after changing pix_fmt to yuv444p10le prores: add missing feature warning for alpha mov: 10l: Terminate string with 0 not '0' mov: Prevent illegal writes when chapter titles are very short. prores: add appropriate -fix_fmt parameter to FATE command riff: always generate a proper WAVEFORMATEX structure in ff_put_wav_header lavc: add a flag-based error_recognition field to AVCodecContext and deprecate non-flag-based ER field lavc: rename deprecation symbol FF_API_VERY_AGGRESSIVE to FF_API_ER Conflicts: libavcodec/avcodec.h libavformat/mov.c tests/fate/prores.mak tests/ref/acodec/g726 tests/ref/fate/prores-alpha Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavc: rename deprecation symbol FF_API_VERY_AGGRESSIVE to FF_API_ERDustin Brody2011-10-141-2/+2
| | | | | | | | Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-10-131-402/+408
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (31 commits) tiffenc: initialize forgotten avctx. avplay: free the active audio packet at exit. avplay: free rdft data used for spectrogram analysis. log.h: make AVClass a named struct fix ac3 encoder documentation vc1: more prettyprinting cosmetics vc1: prettyprint some tables vc1: K&R formatting cosmetics AVOptions: bump minor and add APIchanges entry. cmdutils/avtools: simplify show_help() by using av_opt_child_class_next() AVOptions: rename FF_OPT_TYPE_* => AV_OPT_TYPE_* Remove all uses of deprecated AVOptions API. AVOptions: add av_opt_next, deprecate av_next_option. AVOptions: add functions for evaluating option strings. AVOptions: split get_number(). AVOptions: add av_opt_get*, deprecate av_get*. AVOptions: add av_opt_set*(). AVOptions: add new API for enumerating children. rv34: move inverse transform functions to DSP context flvenc: Write the right metadata entry count ... Conflicts: avconv.c cmdutils.c doc/APIchanges ffplay.c ffprobe.c libavcodec/ac3dec.c libavcodec/h264.c libavcodec/libvpxenc.c libavcodec/libx264.c libavcodec/mpeg12enc.c libavcodec/options.c libavdevice/libdc1394.c libavdevice/v4l2.c libavfilter/vf_drawtext.c libavformat/flvdec.c libavformat/mpegtsenc.c libavformat/options.c libavutil/avutil.h libavutil/opt.c libswscale/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * AVOptions: rename FF_OPT_TYPE_* => AV_OPT_TYPE_*Anton Khirnov2011-10-121-388/+388
| |
| * AVOptions: add new API for enumerating children.Anton Khirnov2011-10-121-13/+19
| | | | | | | | | | | | | | | | | | This will allow the caller to enumerate child contexts in a generic way and since the API is recursive, it also allows for deeper nesting (e.g. AVFormatContext->AVIOContext->URLContext) This will also allow the new setting/reading API to transparently apply to children contexts.
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-10-061-1/+8
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | * qatar/master: Fix 'heigth' vs. 'height' typos. lavc/lavf: use unique private classes. lavc: use designated initializers for av_codec_context_class Conflicts: libavdevice/fbdev.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavc: use designated initializers for av_codec_context_classAnton Khirnov2011-10-051-1/+8
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-10-021-1/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | * qatar/master: lavc: add video/audio/encoding flags to global_quality option libvpxenc: use libvpx's own defaults for some parameters vpxenc: add private options Conflicts: libavcodec/libvpxenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavc: add video/audio/encoding flags to global_quality optionAnton Khirnov2011-10-011-1/+1
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-09-211-3/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: swfdec: Add support for sample_rate_code 0 (5512 Hz) dct-test: factor out some common code and do whas was likely intended doc: library versions need to be bumped in version.h Revert "ffmpeg: get rid of useless AVInputStream.nb_streams." Remove some forgotten AVCodecContext.palctrl usage. lavc/utils: move avcodec_init() higher in the file. lavc: replace some deprecated FF_*_TYPE with AV_PICTURE_TYPE_* ac3dec: actually use drc_scale private option lavc: undeprecate AVPALETTE_SIZE and AVPALETTE_COUNT macros alsa: add missing header msmpeg4: remove leftover unused debug variable declaration Fix assert() calls that need updates after FF_COMMON_FRAME macro elimination. Fix av_dlog invocations with wrong or missing logging context. vf_yadif: add support to yuva420p vf_yadif: correct documentation on the parity parameter vf_yadif: copy buffer properties like aspect for second frame as well oma: support for encrypted files id3v2: add support for non-text and GEOB type tag frames des: add possibility to calculate DES-CBC-MAC with small buffer Conflicts: ffmpeg.c libavcodec/dct-test.c libavformat/mpegts.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Remove some forgotten AVCodecContext.palctrl usage.Anton Khirnov2011-09-211-2/+0
| |
| * ac3dec: actually use drc_scale private optionAnton Khirnov2011-09-211-1/+1
| |
* | lavc: add CODEC_FLAG2_SHOW_ALLMichael Niedermayer2011-09-181-0/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | libx264: fix overwriting preset rc_lookaheadAndrew Wason2011-09-121-1/+1
| | | | | | | | | | | | This fixes https://ffmpeg.org/trac/ffmpeg/ticket/448 - at least for rc_lookahead. A similar problem still exists for the flags2 based options.
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-09-121-1/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (31 commits) audioconvert: add explanatory comments to channel_names array audioconvert: K&R whitespace cosmetics avconv: use correct index when selecting metadata to write to. avconv: fix inverted variable doc/avconv: document option types (input/output/per-stream/...) doc/avtools-common-opts: write a section about stream specifiers. doc/avconv: remove two pointless paragraphs. doc/avconv: document that global options should be specified first. doc/avconv: remove entries for nonexistent options doc/avconv: remove documentation for removed 'timestamp' option doc: cosmetics, rename fftools-common-opts to avtools-.... avconv: move streamid_map to options context. avconv: extend -vf syntax avconv: move top_field_first to options context. avconv: move inter/intra matrix to options context. avconv: remove -psnr option. avconv: remove me_threshold option. avconv: move video_rc_override_string to options context. avconv: move frame pixel format to the options context. avconv: move frame aspect ratio to the options context. ... Conflicts: avconv.c cmdutils_common_opts.h doc/avconv.texi Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avconv: remove me_threshold option.Anton Khirnov2011-09-111-1/+1
| | | | | | | | It's only shadowing the AVOption with the same name.
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-09-071-2/+2
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: Add LATM muxer v210enc: clip values according to specifications v210enc: switch to PIX_FMT_422P10 v210dec: switch to PIX_FMT_422P10 AVOptions: remove AVOption.offset <= 0 checks AVOptions: deprecate av_opt_set_defaults2 AVOptions: move doxy for av_opt_set_defaults() from opt.c to opt.h libx264: fix setting some more parameters libx264: fix setting the H.264 level libx264: add 'direct-pred' private option libx264: add 'partitions' private option Conflicts: Changelog libavcodec/Makefile libavcodec/libx264.c libavcodec/v210enc.c libavfilter/src_movie.c libavformat/version.h libavutil/opt.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * AVOptions: deprecate av_opt_set_defaults2Anton Khirnov2011-09-071-8/+1
| | | | | | | | | | | | It's a hack which was created to allow for multiple options with different defaults to refer to same field (e.g. 'b' vs 'ab'). There is no need for it anymore.
| * libx264: add 'direct-pred' private optionAnton Khirnov2011-09-071-1/+1
| | | | | | | | Deprecate AVCodecContext.directpred
| * libx264: add 'partitions' private optionAnton Khirnov2011-09-071-1/+1
| | | | | | | | Deprecate AVCodecContext.partitions.
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-09-061-5/+9
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: libx264: add 'cplxblur' private option libx264: add 'deblock' private option libx264: add 'b-bias' private option libx264: fix setting some options. libx264: remove useless assignment ac3dec: avoid pointless alloc and indirection for input_buffer mpeg12: cosmetics: reformat as K&R Conflicts: libavcodec/libx264.c libavcodec/mpeg12.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * libx264: add 'cplxblur' private optionAnton Khirnov2011-09-061-1/+1
| | | | | | | | Deprecate AVCodecContext.complexityblur
| * libx264: add 'deblock' private optionAnton Khirnov2011-09-061-0/+2
| | | | | | | | Deprecate AVCodecContext.deblockalpha/deblockbeta
| * libx264: add 'b-bias' private optionAnton Khirnov2011-09-061-0/+2
| | | | | | | | Deprecate AVCodecContext.bframebias.
| * libx264: fix setting some options.Anton Khirnov2011-09-061-4/+4
| | | | | | | | | | | | | | | | | | | | | | Specifically: gop_size, max_b_frames, scenechange_threshold, qmin, qmax, max_qdiff, qblur, qcompress and refs. Change their default values to -1 and only use them if the user explicitly set them. Otherwise x264 defaults are used. Move setting those options after x264_param_default_preset(), so they don't get overwritten by it.
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-09-051-1/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: lavc: fix type for thread_type option avconv: move format to options context avconv: move limit_filesize to options context avconv: move start_time, recording_time and input_ts_offset to options context avconv: add a context for options. cmdutils: allow storing per-stream/chapter/.... options in a generic way cmdutils: split per-option code out of parse_options(). cmdutils: add support for caller-provided option context. cmdutils: declare only one pointer type in OptionDef cmdutils: move grow_array() from avconv to cmdutils. cmdutils: move exit_program() declaration to cmdutils from avconv http: Consider the stream as seekable if the reply contains Accept-Ranges: bytes nutenc: add namespace to the api facing functions Conflicts: avconv.c cmdutils.c cmdutils.h ffmpeg.c ffplay.c ffprobe.c ffserver.c libavformat/http.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavc: fix type for thread_type optionAnton Khirnov2011-09-041-1/+1
| | | | | | | | It should be flags, not int.
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-09-041-1/+6
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: AVOptions: fix av_set_string3() doxy to match reality. cmdutils: get rid of dummy contexts for examining AVOptions. lavf,lavc,sws: add {avcodec,avformat,sws}_get_class() functions. AVOptions: add AV_OPT_SEARCH_FAKE_OBJ flag for av_opt_find(). cpu detection: avoid a signed overflow Conflicts: avconv.c cmdutils.c doc/APIchanges ffmpeg.c libavcodec/options.c libavcodec/version.h libavformat/version.h libavutil/avutil.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavf,lavc,sws: add {avcodec,avformat,sws}_get_class() functions.Anton Khirnov2011-09-031-0/+5
| |
| * AVOptions: add AV_OPT_SEARCH_FAKE_OBJ flag for av_opt_find().Anton Khirnov2011-09-031-1/+1
| | | | | | | | | | It allows to search for options only with AVClass, without allocating the corresponding context.
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-09-011-3/+25
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (31 commits) libx264: set default thread count to 0 (auto) lavc: cosmetics, group deprecated codec flags mpeg12: add 'scan_offset' private option. h263/p encoder: add 'structured_slices' private option. h263/p encoder: add 'obmc' private option. h263p encoder: add 'aiv' private option. h263p encoder: add 'umv' private option. mpeg12enc/mpeg4videoenc: add 'alternate_scan' private option. mjpegdec: add 'extern_huff' private option. mpeg4enc: add 'data_partitioning' private option. snow: add 'memc_only' private option. libx264: add 'mbtree' private option. libx264: add 'psy' private option. libmp3lame: add 'reservoir' private option. mpeg2enc: add 'non_linear_quant' private option mpeg12enc: add drop_frame_timecode private option. mpeg12enc: add intra_vlc private option. VC1: Support dynamic dimension changes mjpeg: treat external huffman table setup failure as codec init failure if external huffman table use requested lavc: deprecate CODEC_FLAG2_BRDO ... Conflicts: avconv.c libavcodec/libmp3lame.c libavcodec/libx264.c libavcodec/mjpegdec.c libavcodec/mpeg12enc.c libavcodec/mpegvideo.h libavcodec/vc1.c libavcodec/vc1dec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mpeg12: add 'scan_offset' private option.Anton Khirnov2011-08-311-0/+2
| | | | | | | | Deprecate CODEC_FLAG_SVCD_SCAN_OFFSET
| * h263/p encoder: add 'structured_slices' private option.Anton Khirnov2011-08-311-1/+1
| | | | | | | | Deprecate CODEC_FLAG_H263P_SLICE_STRUCT
| * h263/p encoder: add 'obmc' private option.Anton Khirnov2011-08-311-0/+2
| | | | | | | | Deprecate CODEC_FLAG_OBMC
| * h263p encoder: add 'aiv' private option.Anton Khirnov2011-08-311-0/+2
| | | | | | | | Deprecate CODEC_FLAG_H263P_AIV
| * h263p encoder: add 'umv' private option.Anton Khirnov2011-08-311-0/+2
| | | | | | | | Deprecate CODEC_FLAG_H263P_UMV
| * mpeg12enc/mpeg4videoenc: add 'alternate_scan' private option.Anton Khirnov2011-08-311-0/+2
| | | | | | | | Deprecate CODEC_FLAG_ALT_SCAN
| * mjpegdec: add 'extern_huff' private option.Anton Khirnov2011-08-311-0/+2
| | | | | | | | Deprecate CODEC_FLAG_EXTERN_HUFF
| * mpeg4enc: add 'data_partitioning' private option.Anton Khirnov2011-08-311-0/+2
| | | | | | | | Deprecate CODEC_FLAG_PART
| * libx264: add 'mbtree' private option.Anton Khirnov2011-08-311-0/+2
| | | | | | | | Deprecate CODEC_FLAG2_MBTREE
| * libx264: add 'psy' private option.Anton Khirnov2011-08-311-1/+1
| | | | | | | | Deprecate CODEC_FLAG2_PSY
| * libmp3lame: add 'reservoir' private option.Anton Khirnov2011-08-311-0/+2
| | | | | | | | Deprecate CODEC_FLAG2_BIT_RESERVOIR
| * mpeg2enc: add 'non_linear_quant' private optionAnton Khirnov2011-08-311-1/+1
| | | | | | | | Deprecate CODEC_FLAG2_NON_LINEAR_QUANT
| * mpeg12enc: add drop_frame_timecode private option.Anton Khirnov2011-08-311-0/+2
| | | | | | | | Deprecate CODEC_FLAG2_DROP_FRAME_TIMECODE
| * mpeg12enc: add intra_vlc private option.Anton Khirnov2011-08-311-0/+2
| | | | | | | | Deprecate CODEC_FLAG2_INTRA_VLC.
| * libx264: add 'aud' private option.Anton Khirnov2011-08-311-1/+1
| | | | | | | | Deprecate CODEC_FLAG2_AUD.
| * libx264: add 'fast-pskip' private option.Anton Khirnov2011-08-311-1/+1
| | | | | | | | Deprecate CODEC_FLAG2_FASTPSKIP.
| * libx264: add '8x8dct' private option.Anton Khirnov2011-08-311-1/+1
| | | | | | | | Deprecate CODEC_FLAG2_8X8DCT.
OpenPOWER on IntegriCloud