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
AgeCommit message (Collapse)Author
2016-10-09cmdutils: fix typosMoritz Barsnick
Signed-off-by: Moritz Barsnick <barsnick@gmx.net> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2016-08-08cmdutils: remove the current working directory from the DLL search path on win32Hendrik Leppkes
Reviewed-by: Matt Oliver <protogonoi@gmail.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2016-02-13fate/source: Do not use GNU extensions in sedTimothy Gu
2015-08-08cmdutils: remove sws_opts usage, simplify codeMichael Niedermayer
It has become unused as all code was switched to AVDictionary Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-08-08cmdutils: Export all sws options using a AVDictionary like the other ↵Michael Niedermayer
subsystems do This makes extracting options other than sws_flags easier Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-19Merge commit 'bd2ab27c488ae92c7820efe11d4f53d84e94d58e'Michael Niedermayer
* commit 'bd2ab27c488ae92c7820efe11d4f53d84e94d58e': avconv: use read_file() for reading the 2pass stats Conflicts: cmdutils.c cmdutils.h ffmpeg_opt.c Merged-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-19avconv: use read_file() for reading the 2pass statsAnton Khirnov
Also, drop the now unused cmdutils_read_file(). There is no reason to have two functions doing essentially the same thing.
2015-05-04ffplay&cmdutils:Factor get_rotation() code outMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-25opts: add list device sources/sinks optionsLukasz Marek
Allows to list sources/sinks of the devices that implement that functionality. Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
2014-05-28ffmpeg: add -devices paramLukasz Marek
FFmpeg mix devices and file formats when -formats option is used. This commit adds a -devices param to list devices only. Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-17cmdutils: replace usages of "#ifdef __MINGW32__" with "#ifdef _WIN32" ↵John Peebles
because MSVC only defines _WIN32 With the previous patch, this should fix ticket #3580 as well. Signed-off-by: John Peebles <johnpeeb@gmail.com>
2014-05-07cmdutils: include config.h, fix "is not defined" warning due to CONFIG_OPENCLMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-29Merge commit '85698be461c07be10d873dd34348bcfe9ffc56e0'Michael Niedermayer
* commit '85698be461c07be10d873dd34348bcfe9ffc56e0': cmdutils: Mark exit_program as av_noreturn Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-28cmdutils: Mark exit_program as av_noreturnLuca Barbato
2013-12-30Allow hiding the banner.Carl Eugen Hoyos
Fixes ticket #3246.
2013-12-10cmdutils & opencl: add -opencl_bench option to test and show available ↵Lenny Wang
OpenCL devices Reviewed-by: Wei Gao <highgod0401@gmail.com> Reviewed-by: Stefano Sabatini <stefasab@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-26cmdutils: remove this_year constant, use CONFIG_THIS_YEAR insteadStefano Sabatini
Simplify.
2013-11-20cmdutils: Add -buildconf option.Stephen Hutchinson
The output is formatted to display one option per line. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-28cmdutils: fix expected signature for show_colors() functionn2.2-devStefano Sabatini
Fix warning: In file included from ffprobe.c:2557:0: cmdutils_common_opts.h:17:5: warning: initialization from incompatible pointer type [enabled by default] cmdutils_common_opts.h:17:5: warning: (near initialization for ‘real_options[16].u.func_arg’) [enabled by default] Spotted-by: Paul B Mahol
2013-10-27cmdutils: add -colors optionStefano Sabatini
2013-10-22Merge commit 'f825d42bccdb9f89669a586951de7f66a81e80a5'Michael Niedermayer
* commit 'f825d42bccdb9f89669a586951de7f66a81e80a5': avplay: Accept cpuflags option Conflicts: cmdutils_common_opts.h doc/ffmpeg.texi doc/fftools-common-opts.texi ffmpeg_opt.c See: 1060e9ce5454e7ac009969ab2cf8f7cd83a69ac3 Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-22avplay: Accept cpuflags optionLuca Barbato
Quite useful for debugging. Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2013-10-19Do not leave positive values undefined when negative are defined as errorMichael Niedermayer
Define positive return values as non errors and leave further meaning undefined This allows future extensions to use these values Reviewed-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-08Merge commit '636ced8e1dc8248a1353b416240b93d70ad03edb'Michael Niedermayer
* commit '636ced8e1dc8248a1353b416240b93d70ad03edb': cmdutils: wrap exit explicitly Conflicts: avprobe.c cmdutils.c ffmpeg.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-07cmdutils: wrap exit explicitlyLuca Barbato
Some C runtime implementations deadlock when calling threading functions on the atexit() handler. Use a simpler wrapper similar to av_log to call the cleanup function before exit. Bug-Id: 523
2013-04-12Merge commit 'e19e8aeeaaff3d4bc8f6065764c93f0298782ac6'Michael Niedermayer
* commit 'e19e8aeeaaff3d4bc8f6065764c93f0298782ac6': avtools: move media_type_string() from avprobe to cmdutils. Conflicts: avprobe.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-11avtools: move media_type_string() from avprobe to cmdutils.Anton Khirnov
It will be useful outside of avprobe.
2013-04-11cmdutils: remove unneeded #ifMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-11cmdutils: add opencl command line options to ffmpeghighgod0401
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-31cmdutils: avtool -> fftoolClément Bœsch
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-12Merge commit '354468fc12dcf93e7fb4af552e18906771913273'Michael Niedermayer
* commit '354468fc12dcf93e7fb4af552e18906771913273': avplay: switch to new refcounted frames API avconv: convert to new refcounted AVFrame API Conflicts: cmdutils.c ffmpeg.c ffmpeg.h ffplay.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-08avconv: print an error on applying options of the wrong type.Anton Khirnov
I.e. input options to output files or vice versa.
2013-03-08avplay: switch to new refcounted frames APIAnton Khirnov
Remove now unused cmdutils get_buffer() implementation.
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-24avconv: pass libavresample options to AVFilterGraphJustin Ruggles
2013-01-11lavf: remove nonexistent symbolsPaul B Mahol
Signed-off-by: Paul B Mahol <onemda@gmail.com>
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-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-20Merge commit '8c9af5b2051b9927f845c7afdfeb30b82670ee77'Michael Niedermayer
* commit '8c9af5b2051b9927f845c7afdfeb30b82670ee77': cmdutils: add a commandline pre-parser. Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-20cmdutils: pass number of groups to split_commandline().Anton Khirnov
This makes the code simpler and avoids mixing designated and non-designated initializers in a potentially unsafe way in avconv.
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>
2012-12-18cmdutils: add a commandline pre-parser.Anton Khirnov
It splits the commandline into a more convenient internal representation for further parsing. This will allow e.g. - processing global options first independently of their location on the commandline, eliminating ugly hacks for processing e.g. cpuflags first - better options validation and error reporting. It is now possible for the parser to know that it's applying an input option to an output file or vice versa and act accordingly.
2012-12-18cmdutils: add a macro to simplify grow_array() calls.Anton Khirnov
2012-11-04Revert "cmdutils: allow specifying the file for -report"Michael Niedermayer
This reverts commit 841bf0ef240f0d862b1f07076e079829456fb117. This does not fully work as the file is used before the filename is parsed so not all information is written in the specified file.
2012-11-01Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* 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>
2012-11-01cmdutils: allow specifying the file for -reportMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-31avconv_opt, cmdutils: Add missing function parameter DoxygenDiego Biurrun
2012-10-08Merge commit '716d413c13981da15323c7a3821860536eefdbbb'Michael Niedermayer
* commit '716d413c13981da15323c7a3821860536eefdbbb': Replace PIX_FMT_* -> AV_PIX_FMT_*, PixelFormat -> AVPixelFormat Conflicts: doc/examples/muxing.c ffmpeg.h ffmpeg_filter.c ffmpeg_opt.c ffplay.c ffprobe.c libavcodec/8bps.c libavcodec/aasc.c libavcodec/aura.c libavcodec/avcodec.h libavcodec/avs.c libavcodec/bfi.c libavcodec/bmp.c libavcodec/bmpenc.c libavcodec/c93.c libavcodec/cscd.c libavcodec/cyuv.c libavcodec/dpx.c libavcodec/dpxenc.c libavcodec/eatgv.c libavcodec/escape124.c libavcodec/ffv1.c libavcodec/flashsv.c libavcodec/fraps.c libavcodec/h264.c libavcodec/huffyuv.c libavcodec/iff.c libavcodec/imgconvert.c libavcodec/indeo3.c libavcodec/kmvc.c libavcodec/libopenjpegdec.c libavcodec/libopenjpegenc.c libavcodec/libx264.c libavcodec/ljpegenc.c libavcodec/mjpegdec.c libavcodec/mjpegenc.c libavcodec/motionpixels.c libavcodec/mpeg12.c libavcodec/mpeg12enc.c libavcodec/mpeg4videodec.c libavcodec/mpegvideo_enc.c libavcodec/pamenc.c libavcodec/pcxenc.c libavcodec/pgssubdec.c libavcodec/pngdec.c libavcodec/pngenc.c libavcodec/pnm.c libavcodec/pnmdec.c libavcodec/pnmenc.c libavcodec/ptx.c libavcodec/qdrw.c libavcodec/qpeg.c libavcodec/qtrleenc.c libavcodec/raw.c libavcodec/rawdec.c libavcodec/rl2.c libavcodec/sgidec.c libavcodec/sgienc.c libavcodec/snowdec.c libavcodec/snowenc.c libavcodec/sunrast.c libavcodec/targa.c libavcodec/targaenc.c libavcodec/tiff.c libavcodec/tiffenc.c libavcodec/tmv.c libavcodec/truemotion2.c libavcodec/utils.c libavcodec/vb.c libavcodec/vp3.c libavcodec/wnv1.c libavcodec/xl.c libavcodec/xwddec.c libavcodec/xwdenc.c libavcodec/yop.c libavdevice/v4l2.c libavdevice/x11grab.c libavfilter/avfilter.c libavfilter/avfilter.h libavfilter/buffersrc.c libavfilter/drawutils.c libavfilter/formats.c libavfilter/src_movie.c libavfilter/vf_ass.c libavfilter/vf_drawtext.c libavfilter/vf_fade.c libavfilter/vf_format.c libavfilter/vf_hflip.c libavfilter/vf_lut.c libavfilter/vf_overlay.c libavfilter/vf_pad.c libavfilter/vf_scale.c libavfilter/vf_transpose.c libavfilter/vf_yadif.c libavfilter/video.c libavfilter/vsrc_testsrc.c libavformat/movenc.c libavformat/mxf.h libavformat/utils.c libavformat/yuv4mpeg.c libavutil/imgutils.c libavutil/pixdesc.c libswscale/input.c libswscale/output.c libswscale/swscale_internal.h libswscale/swscale_unscaled.c libswscale/utils.c libswscale/x86/swscale_template.c libswscale/x86/yuv2rgb.c libswscale/x86/yuv2rgb_template.c libswscale/yuv2rgb.c Merged-by: Michael Niedermayer <michaelni@gmx.at>