summaryrefslogtreecommitdiff
path: root/ffmpeg_opt.c
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit '666fe5da47d127074be7f0e2bac93db6af8b4a30'Michael Niedermayer2013-03-121-0/+89
| | | | | | | | | | | * commit '666fe5da47d127074be7f0e2bac93db6af8b4a30': atomic: Exclude the unsupported implementation headers from checkheaders avconv: do not silently ignore unused codec AVOptions. Conflicts: ffmpeg_opt.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
* Merge commit '6deae8e0530a885b76f149841ed4899cb438ec23'Michael Niedermayer2013-03-121-6/+9
| | | | | | | | | | | | | * commit '6deae8e0530a885b76f149841ed4899cb438ec23': FATE: remove the -dct option from some decoding tests. avconv: use a local variable for InputFile in open_input_file(). Conflicts: tests/fate/microsoft.mak tests/fate/real.mak tests/fate/video.mak Merged-by: Michael Niedermayer <michaelni@gmx.at>
* Merge commit '1da54e908eba73eb86f5d614c51f06811c85c3ea'Michael Niedermayer2013-03-121-12/+15
| | | | | | | * commit '1da54e908eba73eb86f5d614c51f06811c85c3ea': avconv: use a local variable for OutputFile in open_output_file(). Merged-by: Michael Niedermayer <michaelni@gmx.at>
* ffmpeg: fix reinit_filter typeMichael Niedermayer2013-03-121-1/+1
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Merge commit '9d3009c6c4b9b6734f07df7c88f6a42ded6cdf38'Michael Niedermayer2013-03-121-76/+114
| | | | | | | | | | | | | | * commit '9d3009c6c4b9b6734f07df7c88f6a42ded6cdf38': avconv: print an error on applying options of the wrong type. atomic: Check for __sync_val_compare_and_swap instead of __sync_synchronize output-example: Update to use encode_video2 instead of the now dropped encode_video Conflicts: doc/examples/muxing.c ffmpeg_opt.c libavutil/atomic.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
* ffmpeg: add the -canvas_size option.Nicolas George2013-03-101-1/+11
| | | | | | | | Allows, amongst other things, to override the size guessed by the sub2video hack. Note: the -s option could have more or less the same semantic, but it receives a special treatment by the options system.
* ffmpeg_opt: Ask for overwrite in single image2 files tooMichael Niedermayer2013-03-031-1/+2
| | | | | | Fixes Ticket1637 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Deprecate deinterlaced in libavcodec.Ronald S. Bultje2013-03-031-0/+4
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* ffmpeg: fix -stats -v 0Michael Niedermayer2013-03-031-1/+1
| | | | | | Fixes Ticket1687 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Merge commit 'df0229a7caa124dcfb84c34b48d316744c467311'Michael Niedermayer2013-03-011-0/+2
| | | | | | | * commit 'df0229a7caa124dcfb84c34b48d316744c467311': avconv: Apply codec options to streams that are copied as well Merged-by: Michael Niedermayer <michaelni@gmx.at>
* ffmpeg_opt: add -to option to specify stop timeJean First2013-02-271-0/+17
| | | | | Signed-off-by: Jean First <jeanfirst@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* ffmpeg_opt: cosmeticsJean First2013-02-251-1/+1
| | | | | Signed-off-by: Jean First <jeanfirst@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* ffmpeg: use a AVDictionary instead of the context to move swr parameters aroundMichael Niedermayer2013-02-241-4/+3
| | | | | | | This avoids per parameter changes in ffmpeg at the cost of making access somewhat more annoying. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Merge commit '5c7db097ebe1fb5c233cedd8846615074e7d6044'Michael Niedermayer2013-02-241-0/+2
| | | | | | | | | | | | | * commit '5c7db097ebe1fb5c233cedd8846615074e7d6044': avconv: pass libavresample options to AVFilterGraph Conflicts: cmdutils.c cmdutils.h ffmpeg_filter.c ffmpeg_opt.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
* ffmpeg: dont allow -flags to override -passMichael Niedermayer2013-02-061-0/+2
| | | | | | Fixes Ticket2154 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* ffmpeg: free attachments, fix memleakMichael Niedermayer2013-02-031-0/+1
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* ffmpeg: fix broken channel_layout optionMatthieu Bouron2013-02-011-1/+1
| | | | | | Fixes ticket #2163. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* ffmpeg: remove -crop* and -pad* optionsStefano Sabatini2013-01-271-30/+0
| | | | | The options have been deprecated and are non-operational since more than two years.
* ffmpeg: add -guess_layout_max option.Nicolas George2013-01-261-0/+4
|
* ffmpeg: fix typo in open_files() messageStefano Sabatini2013-01-251-1/+1
| | | | Found-By: Justin Ruggles
* Merge commit 'bff3607547fdbb6e32b3830a351e6a33280c1e0d'Michael Niedermayer2013-01-151-2/+0
| | | | | | | | | | * commit 'bff3607547fdbb6e32b3830a351e6a33280c1e0d': lavc: set the default rc_initial_buffer_occupancy Conflicts: libavcodec/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
* doc/ffmpeg: extend documentation for the -filter options and -af/vf aliasesStefano Sabatini2013-01-131-3/+3
|
* ffmpeg: fix dither to 24bit PCM outputMichael Niedermayer2013-01-081-0/+2
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* mpegpsenc: Fix SCR handling for DVDMichael Niedermayer2013-01-041-2/+0
| | | | | | This makes the initial SCR equal 0 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* ffmpeg: apply flags to attachments too.Nicolas George2013-01-011-1/+1
|
* ffmpeg: move stream_copy flags handling after attachments.Nicolas George2013-01-011-12/+11
|
* better filter error message when accidentally reusing outputsrogerdpack2013-01-011-1/+1
| | | | | Signed-off-by: rogerdpack <rogerpack2005@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* ffmpeg: mark attachment streams finished.Nicolas George2013-01-011-0/+1
| | | | Fix trac ticket #2083.
* ffmpeg: avoid negative timestamps for DVDMichael Niedermayer2013-01-011-0/+2
| | | | | | | | dvdauthor cannot handle files with ts wraps Fixes ticket383 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* ffmpeg_opt: fix recording time in->out carryover.Michael Niedermayer2012-12-201-9/+11
| | | | | | This should fix valgrind complaints. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Merge commit 'c661cb6672af5ebcb900ec8766b24761bd2ab011'Michael Niedermayer2012-12-201-2/+2
| | | | | | | | | | | | | | * commit 'c661cb6672af5ebcb900ec8766b24761bd2ab011': cmdutils: pass number of groups to split_commandline(). mov: handle h263 and flv1 for codec_tag 'H','2','6','3' h264: fix sps parsing for SVC and CAVLC 4:4:4 Intra profiles Conflicts: libavcodec/h264_ps.c libavformat/isom.c libavformat/mov.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
* ffmpeg_opt: fix pointer typesMichael Niedermayer2012-12-201-2/+2
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Merge commit 'acb571c89a065d943163c11efb46de35774f1909'Michael Niedermayer2012-12-201-1/+1
| | | | | | | | | | | | | * commit 'acb571c89a065d943163c11efb46de35774f1909': avcodec: bump minor for adaptive h264 frame-mt avconv: pass the actually selected decoder to filter_codec_opts(). Conflicts: Changelog ffmpeg_opt.c libavcodec/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
* Merge commit '77bd1bc73a1946b0f0ce09a7cbb242a65e138d06'Michael Niedermayer2012-12-201-66/+173
| | | | | | | | | | | | * commit '77bd1bc73a1946b0f0ce09a7cbb242a65e138d06': avconv: use new options parser. Conflicts: ffmpeg.c ffmpeg.h ffmpeg_opt.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
* ffmpeg: use GROW_ARRAY in opt_map_channel.Clément Bœsch2012-12-191-3/+1
|
* Merge commit '10bca66101b79954512cd9d8ee20c3bc4513adf3'Michael Niedermayer2012-12-191-13/+8
| | | | | | | * commit '10bca66101b79954512cd9d8ee20c3bc4513adf3': cmdutils: add a macro to simplify grow_array() calls. Merged-by: Michael Niedermayer <michaelni@gmx.at>
* ffmpeg: use avformat_seek_file() instead of av_seek_frame().Clément Bœsch2012-12-021-1/+1
| | | | | | | | avformat_seek_file() is the new API. It will make sure the read_seek2() callback is called when the demuxer has it. Signed-off-by: Michael Niedermayer <michaelni@gmx.at> Signed-off-by: Clément Bœsch <ubitux@gmail.com>
* ffmpeg: fix swr filter_type for auto inserted aresample filtersMichael Niedermayer2012-11-261-0/+1
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Merge commit '28c8e288fa0342fdef532a7522a4707bebf831cc'Michael Niedermayer2012-11-261-2/+2
| | | | | | | | | | | | | | | * commit '28c8e288fa0342fdef532a7522a4707bebf831cc': x86: h264_chromamc: port to cpuflags yop: fix typo avconv: fix copying per-stream metadata. doc: avtools-common-opts: Fix terminology concerning metric prefixes configure: suncc: Add compiler arch support for Nehalem & Sandy Bridge riff: Make ff_riff_tags static and move under appropriate #ifdef Conflicts: libavformat/riff.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
* replace av_log(0, by av_log(NULL,Michael Niedermayer2012-11-231-1/+1
| | | | | | The first parameter is a pointer and NULL is more correct Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Merge commit '97bf7c03b1338a867da52c159a2afecbdedcfa88'Michael Niedermayer2012-11-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '97bf7c03b1338a867da52c159a2afecbdedcfa88': doc: git-howto: Leave reviewers time to react before pushing patches Include libavutil/channel_layout.h instead of libavutil/audioconvert.h lavu: rename audioconvert.* to channel_layout.* and deprecate audioconvert.h Conflicts: doc/APIchanges doc/examples/decoding_encoding.c doc/git-howto.texi ffmpeg_filter.c libavcodec/flacdec.c libavcodec/imc.c libavcodec/mpegaudiodec.c libavcodec/utils.c libavfilter/asrc_anullsrc.c libavfilter/audio.c libavfilter/avfilter.c libavfilter/avfilter.h libavfilter/avfiltergraph.c libavfilter/buffer.c libavutil/Makefile libavutil/audioconvert.h libavutil/channel_layout.c libavutil/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
* ffmpeg: complain loudly and exit in case removed -sameq option is specifiedStefano Sabatini2012-11-031-2/+5
| | | | | This is better than silently ignoring the option, which results in unexpected quality results.
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-11-011-0/+1
| | | | | | | | | | | | * qatar/master: fate: add ac3/eac3 tests to FATE_SAMPLES_AVCONV avconv_opt, cmdutils: Add missing function parameter Doxygen x86: Move optimization suffix to end of function names Conflicts: cmdutils.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
* ffmpeg: use av_rescale_delta() on the audio filter inputMichael Niedermayer2012-10-271-0/+2
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Merge commit '2b8dd371e4d276ca0d342e82b8b4cc281be0630a'Michael Niedermayer2012-10-231-27/+28
| | | | | | | | | | | | | | | | * commit '2b8dd371e4d276ca0d342e82b8b4cc281be0630a': lavu: postpone recent deprecations until the next major bump APIchanges: update lavr bump date avconv: only apply presets when we have an encoder. atrac3: replace a calculation with FFALIGN() atrac3: remove unused ATRAC3Context field, sample_rate atrac3: use sizeof(variable) instead of sizeof(type) atrac3: simplify MDCT window calculation Conflicts: doc/APIchanges Merged-by: Michael Niedermayer <michaelni@gmx.at>
* Merge commit '71e92414bfd79e56ea6fff174a665ff7b9b86e68'Michael Niedermayer2012-10-171-1/+7
| | | | | | | | | | | | * commit '71e92414bfd79e56ea6fff174a665ff7b9b86e68': lavf: move RIFF INFO tag writing from avienc to riff avconv: fix disabling auto mappings with -map_metadata Conflicts: ffmpeg_opt.c libavformat/riff.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
* ffmpeg: Make video filter graph reinit user selectableMichael Niedermayer2012-10-171-0/+5
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Merge commit 'bc4620e5d61a4dd9a1f654fadd281a172aab04be'Michael Niedermayer2012-10-131-5/+3
| | | | | | | | | | | | | | * commit 'bc4620e5d61a4dd9a1f654fadd281a172aab04be': Remove libmpeg2 #define remnants De-doxygenize some top-level files Conflicts: ffmpeg.c ffmpeg.h ffmpeg_filter.c ffplay.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
* Merge commit '4436f25a1682ada3f7226cb6fadf429946933161'Michael Niedermayer2012-10-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '4436f25a1682ada3f7226cb6fadf429946933161': build: remove references to unused EXTRAOBJS variable lavfi: convert input/ouput list compound literals to named objects fate: add h263 obmc vsynth tests avconv: remove bogus warning when using avconv -h without parameter averror: explicitly define AVERROR_* values flashsv: propagate inflateReset() errors indeo4/5: remove constant parameter num_bands from wavelet recomposition mxfdec: return error if no segments are available in mxf_get_sorted_table_segments Double motion vector range for HPEL interlaced picture in proper place Conflicts: libavcodec/v210dec.h libavfilter/af_aformat.c libavfilter/af_amix.c libavfilter/af_asyncts.c libavfilter/af_channelmap.c libavfilter/af_join.c libavfilter/asrc_anullsrc.c libavfilter/buffersrc.c libavfilter/f_setpts.c libavfilter/f_settb.c libavfilter/fifo.c libavfilter/src_movie.c libavfilter/vf_ass.c libavfilter/vf_blackframe.c libavfilter/vf_boxblur.c libavfilter/vf_delogo.c libavfilter/vf_drawbox.c libavfilter/vf_drawtext.c libavfilter/vf_fade.c libavfilter/vf_fieldorder.c libavfilter/vf_fps.c libavfilter/vf_hflip.c libavfilter/vf_overlay.c libavfilter/vf_pad.c libavfilter/vf_select.c libavfilter/vf_transpose.c libavfilter/vf_yadif.c libavfilter/vsrc_testsrc.c libavformat/mxfdec.c libavutil/error.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
* ffmpeg_opt: dont fail for sameq/same_quant.Michael Niedermayer2012-10-111-0/+10
| | | | | | Instead print a warning. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
View Lorry Controller Status