aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/options.c
Commit message (Collapse)AuthorAgeFilesLines
...
| * 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.
| * libx264: add 'mixed-refs' private option.Anton Khirnov2011-08-311-1/+1
| | | | | | | | Deprecate CODEC_FLAG2_MIXED_REFS.
| * libx264: add 'weightb' private option.Anton Khirnov2011-08-311-1/+1
| | | | | | | | Deprecate CODEC_FLAG2_BPYRAMID.
| * libx264: add 'b-pyramid' private option.Anton Khirnov2011-08-311-0/+2
| | | | | | | | Deprecate CODEC_FLAG2_BPYRAMID.
| * libx264: add 'intra-refresh' private option.Anton Khirnov2011-08-311-2/+0
| | | | | | | | Deprecate CODEC_FLAG2_INTRA_REFRESH.
| * libx264: add 'ssim' private option.Anton Khirnov2011-08-311-1/+1
| | | | | | | | Deprecate CODEC_FLAG2_SSIM.
* | acodec: change default bitrate to 128kMichael Niedermayer2011-08-261-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-08-241-6/+13
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: avconv: Replace goto redo on decode fail with continue. avconv: Remove dead store. libx264: add 'crf_max' private option. libx264: add 'weightp' private option. libx264: add 'rc_lookahead' private option. libx264: add 'psy_trellis' private option. libx264: add 'psy_rd' private option. libx264: add 'aq_strength' private option. libx264: add 'aq_mode' private option. libx264: add 'cqp' private option. libx264: add 'crf' private option. lavc: remove vbv_delay option lavf utils: Fix bad indentation. avconv: use av_clip_int16 for audio clipping Conflicts: libavcodec/libx264.c libavcodec/options.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * libx264: add 'crf_max' private option.Anton Khirnov2011-08-241-0/+2
| | | | | | | | Deprecate corresponding global option.
| * libx264: add 'weightp' private option.Anton Khirnov2011-08-241-1/+3
| | | | | | | | Deprecate corresponding global option.
| * libx264: add 'rc_lookahead' private option.Anton Khirnov2011-08-241-1/+1
| | | | | | | | Deprecate corresponding global option.
| * libx264: add 'psy_trellis' private option.Anton Khirnov2011-08-241-3/+1
| | | | | | | | Deprecate corresponding global option.
| * libx264: add 'psy_rd' private option.Anton Khirnov2011-08-241-1/+3
| | | | | | | | Deprecate corresponding global option.
| * libx264: add 'aq_strength' private option.Anton Khirnov2011-08-241-1/+1
| | | | | | | | Deprecate corresponding global option.
| * libx264: add 'aq_mode' private option.Anton Khirnov2011-08-241-1/+3
| | | | | | | | Deprecate corresponding global option.
| * libx264: add 'cqp' private option.Anton Khirnov2011-08-241-1/+1
| | | | | | | | Deprecate corresponding global option.
| * libx264: add 'crf' private option.Anton Khirnov2011-08-241-0/+2
| | | | | | | | | | | | | | Deprecate corresponding global option. Ideally all x264 private options should be generated automatically, but x264 doesn't provide the API for this yet.
| * lavc: remove vbv_delay optionAnton Khirnov2011-08-241-1/+0
| | | | | | | | It's broken and serves no purpose as it's a read-only field.
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-08-221-2/+2
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: libx264: only use ABR mode when the user explicitly set bitrate. libx264: use medium preset by default. mp2 encoder: make 128k the default bitrate. movenc: use libx264 by default when possible for mov, mp4 and psp avienc: saner default audio codec. matroskaenc: saner default codecs. avplay: add examples of how to specify size/pixel format through private options lavc: add A|E|D flags to "ac" and "ar" options Conflicts: doc/ffplay.texi libavcodec/libx264.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavc: add A|E|D flags to "ac" and "ar" optionsStefano Sabatini2011-08-211-2/+2
| | | | | | | | | | | | | | | | Fix setting of the corresponding AVCodecContext fields via cmdutils.c:filter_codec_opts(). In particular, fix ffplay -ac and -ar options. Signed-off-by: Anton Khirnov <anton@khirnov.net>