Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/FFmpeg/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/ffmpeg_opt.c
AgeCommit message (Collapse)Author
2013-05-01Merge commit '3d624420086ed3cd0c74f4510f0285968e21c117'Michael Niedermayer
* commit '3d624420086ed3cd0c74f4510f0285968e21c117': avconv_opt: allocate an OutputFile before the streams. Conflicts: ffmpeg_opt.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-19ffmpeg: make -aspect work with -vcodec copy.Nicolas George
2013-04-12Merge commit 'dc574658d15ad8f171dbdecbdce7197acf9424a0'Michael Niedermayer
* commit 'dc574658d15ad8f171dbdecbdce7197acf9424a0': avconv: print filter options in -h full output. Conflicts: ffmpeg_opt.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-12Merge commit '38f0c0781a6e099f11c0acec07f9b8be742190c4'Michael Niedermayer
* 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>
2013-04-09ffmpeg: use a rational for -aspect option.Nicolas George
2013-04-08ffmpeg: Print a warning when -frames is affecting non video framesMichael Niedermayer
Fixes Ticket2395 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-28Merge commit '1ae44c87c924b69a0657256fbaa8ad140df2f27c'Michael Niedermayer
* 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>
2013-03-26ffmpeg_opt: avoid strcpy()Michael Niedermayer
This fixes a warning on openbsd and is more robust Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-21ffmpeg: Replace -deinterlace (which was broken by the buffer ref stuff) with ↵Michael Niedermayer
yadif injection Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-17ffmpeg: make -lavfi an alias for -filter_complex.Nicolas George
2013-03-16ffmpeg_opt: add OPT_INPUT to -fix_sub_duration and -canvas_size.Nicolas George
2013-03-15Merge commit '3e175a2a550f5c2f788e8cd969052e10a5025a27'Michael Niedermayer
* 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>
2013-03-14ffmpeg: add OPT_INPUT to -guess_layout_max.Nicolas George
2013-03-14ffmpeg: add OPT_OUTPUT to -to option.Nicolas George
Fix trac ticket #2355.
2013-03-13Merge commit '666fe5da47d127074be7f0e2bac93db6af8b4a30'Michael Niedermayer
* 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>
2013-03-13Merge commit '6deae8e0530a885b76f149841ed4899cb438ec23'Michael Niedermayer
* 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>
2013-03-12Merge commit '1da54e908eba73eb86f5d614c51f06811c85c3ea'Michael Niedermayer
* commit '1da54e908eba73eb86f5d614c51f06811c85c3ea': avconv: use a local variable for OutputFile in open_output_file(). Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-12ffmpeg: fix reinit_filter typeMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-12Merge commit '9d3009c6c4b9b6734f07df7c88f6a42ded6cdf38'Michael Niedermayer
* 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>
2013-03-10ffmpeg: add the -canvas_size option.Nicolas George
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.
2013-03-04ffmpeg_opt: Ask for overwrite in single image2 files tooMichael Niedermayer
Fixes Ticket1637 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-04Deprecate deinterlaced in libavcodec.Ronald S. Bultje
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-03ffmpeg: fix -stats -v 0Michael Niedermayer
Fixes Ticket1687 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-01Merge commit 'df0229a7caa124dcfb84c34b48d316744c467311'Michael Niedermayer
* commit 'df0229a7caa124dcfb84c34b48d316744c467311': avconv: Apply codec options to streams that are copied as well Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-27ffmpeg_opt: add -to option to specify stop timeJean First
Signed-off-by: Jean First <jeanfirst@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-25ffmpeg_opt: cosmeticsJean First
Signed-off-by: Jean First <jeanfirst@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-24ffmpeg: use a AVDictionary instead of the context to move swr parameters aroundMichael Niedermayer
This avoids per parameter changes in ffmpeg at the cost of making access somewhat more annoying. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-24Merge commit '5c7db097ebe1fb5c233cedd8846615074e7d6044'Michael Niedermayer
* 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>
2013-02-06ffmpeg: dont allow -flags to override -passMichael Niedermayer
Fixes Ticket2154 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-03ffmpeg: free attachments, fix memleakMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-02ffmpeg: fix broken channel_layout optionMatthieu Bouron
Fixes ticket #2163. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-27ffmpeg: remove -crop* and -pad* optionsStefano Sabatini
The options have been deprecated and are non-operational since more than two years.
2013-01-26ffmpeg: add -guess_layout_max option.Nicolas George
2013-01-25ffmpeg: fix typo in open_files() messageStefano Sabatini
Found-By: Justin Ruggles
2013-01-15Merge commit 'bff3607547fdbb6e32b3830a351e6a33280c1e0d'Michael Niedermayer
* commit 'bff3607547fdbb6e32b3830a351e6a33280c1e0d': lavc: set the default rc_initial_buffer_occupancy Conflicts: libavcodec/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-13doc/ffmpeg: extend documentation for the -filter options and -af/vf aliasesStefano Sabatini
2013-01-08ffmpeg: fix dither to 24bit PCM outputMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-04mpegpsenc: Fix SCR handling for DVDMichael Niedermayer
This makes the initial SCR equal 0 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-01ffmpeg: apply flags to attachments too.Nicolas George
2013-01-01ffmpeg: move stream_copy flags handling after attachments.Nicolas George
2013-01-01better filter error message when accidentally reusing outputsrogerdpack
Signed-off-by: rogerdpack <rogerpack2005@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-01ffmpeg: mark attachment streams finished.Nicolas George
Fix trac ticket #2083.
2013-01-01ffmpeg: avoid negative timestamps for DVDMichael Niedermayer
dvdauthor cannot handle files with ts wraps Fixes ticket383 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-20ffmpeg_opt: fix recording time in->out carryover.Michael Niedermayer
This should fix valgrind complaints. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-20Merge commit 'c661cb6672af5ebcb900ec8766b24761bd2ab011'Michael Niedermayer
* 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>
2012-12-20ffmpeg_opt: fix pointer typesMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-20Merge commit 'acb571c89a065d943163c11efb46de35774f1909'Michael Niedermayer
* 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>
2012-12-20Merge commit '77bd1bc73a1946b0f0ce09a7cbb242a65e138d06'Michael Niedermayer
* commit '77bd1bc73a1946b0f0ce09a7cbb242a65e138d06': avconv: use new options parser. Conflicts: ffmpeg.c ffmpeg.h ffmpeg_opt.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-20ffmpeg: use GROW_ARRAY in opt_map_channel.Clément Bœsch
2012-12-20Merge commit '10bca66101b79954512cd9d8ee20c3bc4513adf3'Michael Niedermayer
* commit '10bca66101b79954512cd9d8ee20c3bc4513adf3': cmdutils: add a macro to simplify grow_array() calls. Merged-by: Michael Niedermayer <michaelni@gmx.at>
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-27 01:10:53 +0300