aboutsummaryrefslogtreecommitdiffstats
path: root/ffmpeg_opt.c
Commit message (Collapse)AuthorAgeFilesLines
* ffmpeg: Do not fill gap before the first decodable frame on single stream ↵Michael Niedermayer2013-11-171-0/+1
| | | | | | | | | | | | | | | | | | input files unless the user explicitly requests it. Fixes different behavior to JM and probably several if not all reference decoders. We cannot just do this unconditionally as it would ruin AV sync in some use cases. Bug-Found-by: BugMaster Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit d7ebeba80c609e160a171168b3434c342a652237) Conflicts: ffmpeg.c
* make it possible to compile ffmpeg without swscalePaul B Mahol2013-10-211-0/+2
| | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* ffmpeg: add max_error_rate to allow tuning the point decoding errors are ↵Michael Niedermayer2013-10-071-0/+3
| | | | | | | considered a failure of the whole transcoding. Suggested-by: Daemon404 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* ffmpeg: avoid direct access to lowres use av_codec_g/set_lowres()Michael Niedermayer2013-10-031-1/+1
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* ffmpeg: add support to force specific AVCodecsMichael Niedermayer2013-10-021-0/+8
| | | | | | | | previously only codec_ids could be forced, which did not allow forcing a specific implementation like libopenjpeg vs jpeg2000. Reviewed-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Merge commit '488a0fa68973d48e264d54f1722f7afb18afbea7'Michael Niedermayer2013-08-061-1/+3
| | | | | | | | | | | * commit '488a0fa68973d48e264d54f1722f7afb18afbea7': avconv: support -t as an input option. Conflicts: Changelog ffmpeg.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
* ffmpeg_opt: Remove support for specifying -t anywhere to set the durationMichael Niedermayer2013-08-061-19/+6
| | | | | | This would otherwise conflict with the semantics of using -t for the input Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Merge commit '811bd0784679dfcb4ed02043a37c92f9df10500e'Michael Niedermayer2013-08-061-0/+6
| | | | | | | | | | | | | * commit '811bd0784679dfcb4ed02043a37c92f9df10500e': avconv: make input -ss accurate when transcoding Conflicts: Changelog doc/ffmpeg.texi ffmpeg.h ffmpeg_filter.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
* Merge commit '56ee3f9de7b9f6090d599a27d33a392890a2f7b8'Michael Niedermayer2013-08-061-5/+8
| | | | | | | | | | | * commit '56ee3f9de7b9f6090d599a27d33a392890a2f7b8': avconv: distinguish between -ss 0 and -ss not being used Conflicts: ffmpeg.c ffmpeg_opt.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
* Merge commit '7748dd41be3d6dd6300f14263586af4ee104ead2'Michael Niedermayer2013-08-011-3/+8
| | | | | | | | | | | | | * commit '7748dd41be3d6dd6300f14263586af4ee104ead2': avconv: add -n option to immediately exit when output files already exist Conflicts: Changelog doc/ffmpeg.texi ffmpeg_opt.c See: 0a4f02117b67c135a27e3490aea1631ad9f4312f Merged-by: Michael Niedermayer <michaelni@gmx.at>
* ffmpeg_opt: do not warn about unused gop_timecodeMichael Niedermayer2013-07-091-0/+4
| | | | | | | | The option is injected by generic code and being sometimes unused is normal. Fixes Ticket2762 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* ffmpeg: Allow overriding ffservers inputMichael Niedermayer2013-07-091-1/+4
| | | | | | Fixes Ticket1970 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* ffmpeg: move creation_time for ffserver setting upMichael Niedermayer2013-07-091-3/+10
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* ffmpeg_opt: replace exit() by exit_program()Michael Niedermayer2013-07-081-81/+81
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* ffmpeg: add -apad option which injects a apad filter only in the presence of ↵Michael Niedermayer2013-05-081-0/+6
| | | | | | video streams Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* ffmpeg: move a local variable definition later.Nicolas George2013-05-071-1/+2
| | | | Fix a segfault when using the -map option without input files.
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-05-031-0/+1
| | | | | | | | | | * qatar/master: avconv: do not send non-monotonous DTS to the muxers. Conflicts: ffmpeg_opt.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
* Merge commit '3d624420086ed3cd0c74f4510f0285968e21c117'Michael Niedermayer2013-05-011-32/+33
| | | | | | | | | | * commit '3d624420086ed3cd0c74f4510f0285968e21c117': avconv_opt: allocate an OutputFile before the streams. Conflicts: ffmpeg_opt.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
* ffmpeg: make -aspect work with -vcodec copy.Nicolas George2013-04-181-13/+13
|
* Merge commit 'dc574658d15ad8f171dbdecbdce7197acf9424a0'Michael Niedermayer2013-04-121-1/+1
| | | | | | | | | | * commit 'dc574658d15ad8f171dbdecbdce7197acf9424a0': avconv: print filter options in -h full output. Conflicts: ffmpeg_opt.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
* Merge commit '38f0c0781a6e099f11c0acec07f9b8be742190c4'Michael Niedermayer2013-04-111-1/+0
| | | | | | | | | | | | | | | * commit '38f0c0781a6e099f11c0acec07f9b8be742190c4': lavfi: merge avfiltergraph.h into avfilter.h Conflicts: doc/APIchanges ffmpeg_filter.c libavfilter/avfilter.h libavfilter/avfiltergraph.h libavfilter/version.h tools/graph2dot.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
* ffmpeg: use a rational for -aspect option.Nicolas George2013-04-091-1/+1
|
* ffmpeg: Print a warning when -frames is affecting non video framesMichael Niedermayer2013-04-071-0/+8
| | | | | | Fixes Ticket2395 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Merge commit '1ae44c87c924b69a0657256fbaa8ad140df2f27c'Michael Niedermayer2013-03-281-10/+82
| | | | | | | | | | | | | | | | | | | | | * commit '1ae44c87c924b69a0657256fbaa8ad140df2f27c': lavfi/gradfun: remove rounding to match C and SSE code. lavfi/gradfun: fix dithering in MMX code. lavfi/gradfun: fix rounding in MMX code. lavfi/gradfun: do not increment DC pointer for odd values. fate: filter: Add dependencies avconv: add options for reading filtergraphs from a file. Conflicts: Changelog doc/ffmpeg.texi doc/filters.texi ffmpeg.h ffmpeg_opt.c libavfilter/vf_gradfun.c tests/fate/filter.mak Merged-by: Michael Niedermayer <michaelni@gmx.at>
* ffmpeg_opt: avoid strcpy()Michael Niedermayer2013-03-261-1/+1
| | | | | | This fixes a warning on openbsd and is more robust Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* ffmpeg: Replace -deinterlace (which was broken by the buffer ref stuff) with ↵Michael Niedermayer2013-03-211-12/+1
| | | | | | yadif injection Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* ffmpeg: make -lavfi an alias for -filter_complex.Nicolas George2013-03-171-0/+2
|
* ffmpeg_opt: add OPT_INPUT to -fix_sub_duration and -canvas_size.Nicolas George2013-03-161-2/+2
|
* Merge commit '3e175a2a550f5c2f788e8cd969052e10a5025a27'Michael Niedermayer2013-03-151-0/+1
| | | | | | | | * commit '3e175a2a550f5c2f788e8cd969052e10a5025a27': avconv: mark attachment streams as immediately finished vaapi: fix argument for ff_vaapi_common_end_frame call Merged-by: Michael Niedermayer <michaelni@gmx.at>
* ffmpeg: add OPT_INPUT to -guess_layout_max.Nicolas George2013-03-141-1/+1
|
* ffmpeg: add OPT_OUTPUT to -to option.Nicolas George2013-03-141-1/+1
| | | | Fix trac ticket #2355.
* 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
|