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

github.com/mpc-hc/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2015-02-11cmdutils: fix success pathJean Delvare
Since commit 934f2d2f5c16df8aad9f401a9fd842b5d9a78b11, cmdutils_read_file() prints a confusing message on success: IO error: Success This is because the error message is printed on the success path as well. Add the missing condition so that it is only printed on error. Signed-off-by: Jean Delvare <jdelvare@suse.de> Cc: Michael Niedermayer <michaelni@gmx.at> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-02stop embedding the build dateAndreas Cadhalpun
Theis makes the build binary reproducible. Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-11cmdutils: use av_match_name to filter devicesLukasz Marek
Device name may be coma-separated list. Use dedicated funtion to compare. Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
2015-01-11cmdutils: use helper functions for listing sinks/sourcesLukasz Marek
List device callback must be able to return valid list without opening device. This callback should return input values for open function, not vice-versa. Read header funtion is very likey to fail without proper configuration provided. Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
2015-01-06cmdutils.c: Use av_realloc_array()Michael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-06cmdutils: Use 64bit for file size/offset related variable in ↵Michael Niedermayer
cmdutils_read_file() Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-12-19Merge commit 'b1306823d0b3ae998c8e10ad832004eb13bdd93e'Michael Niedermayer
* commit 'b1306823d0b3ae998c8e10ad832004eb13bdd93e': check memory errors from av_strdup() Conflicts: avprobe.c libavformat/matroskaenc.c libavutil/opt.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-12-19Merge commit '38129c26c51b933d7db423f904ba0cd6a88ca1ed'Michael Niedermayer
* commit '38129c26c51b933d7db423f904ba0cd6a88ca1ed': cmdutils: check file access functions return values Conflicts: cmdutils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-12-19check memory errors from av_strdup()Vittorio Giovara
2014-12-19cmdutils: check file access functions return valuesVittorio Giovara
CC: libav-stable@libav.org Bug-Id: CID 703706
2014-12-15cmdutils: use macros for device testLukasz Marek
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
2014-11-17cmdutils: Exit in case of faulty stream specifiersMichael Niedermayer
Avoids printing confusing and unrelated errors Fixes Ticket2772 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-10-25cmdutils: Read errno before av_log() as the callback from av_log() might ↵Michael Niedermayer
affect errno Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-17Merge commit '47e3e1097e09da7f973908e09df15e3bb7c5e1f4'Michael Niedermayer
* commit '47e3e1097e09da7f973908e09df15e3bb7c5e1f4': cmdutils: Use the correct guard Conflicts: cmdutils.c See: 35daf3ca8173f80f200860e06a410ced31a8b360 Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-17cmdutils: Use the correct guardLuca Barbato
The OptionDef arrays are terminated with a { NULL } element not NULL. CC: libav-stable@libav.org Bug-Id: CID 703769
2014-09-17Merge commit '2dd09ebf5597fd5e4a573bee9cccf21ae821f286'Michael Niedermayer
* commit '2dd09ebf5597fd5e4a573bee9cccf21ae821f286': cmdutils: Print a more sensible message in show_filters() w/o libavfilter Conflicts: cmdutils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-09-16cmdutils: Print a more sensible message in show_filters() w/o libavfilterDiego Biurrun
Also avoid an unused variable warning for compilers w/o av_unused support.
2014-09-02cmdutils: Add some whitespace when printing layoutsTobias Rapp
Adds some more whitespace between channel layout name and decomposition. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-16Drop remaining unneeded != NULLMichael Niedermayer
Reviewed-by: Clément Bœsch <u@pkh.me> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-15Merge commit '4b1f5e5090abed6c618c8ba380cd7d28d140f867'Michael Niedermayer
* commit '4b1f5e5090abed6c618c8ba380cd7d28d140f867': cosmetics: Write NULL pointer inequality checks more compactly Conflicts: libavcodec/dvdsubdec.c libavcodec/h263dec.c libavcodec/libxvid.c libavcodec/rv10.c libavcodec/utils.c libavformat/format.c libavformat/matroskadec.c libavformat/segment.c libavutil/opt.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-15Merge commit 'f929ab0569ff31ed5a59b0b0adb7ce09df3fca39'Michael Niedermayer
* commit 'f929ab0569ff31ed5a59b0b0adb7ce09df3fca39': cosmetics: Write NULL pointer equality checks more compactly Conflicts: cmdutils.c ffmpeg_opt.c ffplay.c libavcodec/dvbsub.c libavcodec/dvdsubdec.c libavcodec/dvdsubenc.c libavcodec/dxa.c libavcodec/libxvid_rc.c libavcodec/mpegvideo.c libavcodec/mpegvideo_enc.c libavcodec/rv10.c libavcodec/tiffenc.c libavcodec/utils.c libavcodec/vc1dec.c libavcodec/zmbv.c libavdevice/v4l2.c libavformat/matroskadec.c libavformat/movenc.c libavformat/sdp.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-15cosmetics: Write NULL pointer inequality checks more compactlyGabriel Dume
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2014-08-15cosmetics: Write NULL pointer equality checks more compactlyGabriel Dume
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2014-08-13cmdutils: allow matching by metadata in stream specifiersAnton Khirnov
2014-06-29cmdutils: ignore sws_flags if swscale is not enabledMichael Niedermayer
This avoids some failures during fate when swscale is disabled Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-16version string: add copyright line to version stringSimon Thelen
Show the copyright when running `ffmpeg -version'. This is useful for end users trying to determine whether they are using FFmpeg or Libav. Signed-off-by: Simon Thelen <ffmpeg@c-14.de>
2014-06-15cmdutils: implement FFREPORT=level=...Michael Niedermayer
Fixes Ticket3057 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
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-04-30cmdutils: omit deprecated codec ids in help outputMichael Niedermayer
These ids should be meaningless for the end user and would only confuse Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-26cmdutils: preserve unchanged log flags when setting AV_LOG_SKIP_REPEATEDtue46wsdgxfjrt
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-08cmdutils: use av_mallocz_array()Michael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-28cmdutils/filter_codec_opts: do not discard all options for CODEC_ID_NONEMichael Niedermayer
This fixes cases where the codec is detect later than the stream creation No testcase with unmodified source known Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-13avconv: Match stream idLuca Barbato
Quite useful to select by pid in MPEG-TS.
2014-01-06cmdutils: update copyright year to 2014.Johan Andersson
Signed-off-by: Martin Storsjö <martin@martin.st>
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-12-01build: rename version.h to libavutil/ffversion.hTimothy Gu
Also the libavutil/ffversion.h will be installed. Rationale: * Applications might want to know FFmpeg's version besides the individual libraries'. * Avoids file name clash between FFmpeg's ./version.h and lib*/version.h when a library source file includes both and is compiled on an out-of-tree build. Fixes #1769. Signed-off-by: Timothy Gu <timothygu99@gmail.com> Reviewed-by: James Almer <jamrial@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-28Revert "configure: add #include "version.h" to config.h"Michael Niedermayer
This reverts commit ca21116b3f53a9bdd74364bfab9cde70a044b165. Revert suggested by Jamal: "Bad secondary effect i just noticed: Every time version.h is changed (git pull for example), anything that includes config.h will be recompiled. And that means pretty much every single file in the tree. "
2013-11-28configure: add #include "version.h" to config.hTimothy Gu
Avoid clash with version.h of the libraries. Signed-off-by: Timothy Gu <timothygu99@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-26configure: define CONFIG_THIS_YEAR at the configure levelStefano Sabatini
The macro value can be shared between configure script and cmdutils.c.
2013-11-24Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: Add missing #includes for *INT64_MAX and *INT64_C Conflicts: ffmpeg.c ffmpeg_filter.c ffplay.c libavformat/assdec.c libavformat/avidec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-24Add missing #includes for *INT64_MAX and *INT64_CDiego Biurrun
2013-11-21cmdutils&ffmpeg: use av_fopen_utf8() for passlogfileMichael Niedermayer
might fix Ticket3056 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-21cmdutils: randomize spaces after 69cf626f9.Clément Bœsch
2013-11-20cmdutils: cosmeticsMichael Niedermayer
requested by multiple people Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
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() functionStefano 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