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-02-06cmdutils: realign for some additional filters with very long namePaul B Mahol
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2015-12-07cosmetics: Fix weird indentationsTimothy Gu
2015-12-07cmdutils: use version accessor macrosReynaldo H. Verdejo Pinochet
Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
2015-11-04all: use FFDIFFSIGN to resolve possible undefined behavior in comparatorsGanesh Ajjanagadde
FFDIFFSIGN was created explicitly for this purpose, since the common return a - b idiom is unsafe regarding overflow on signed integers. It optimizes to branchless code on common compilers. FFDIFFSIGN also has the subjective benefit of being easier to read due to lack of ternary operators. Tested with FATE. Things not covered by this are unsigned integers, for which overflows are well defined, and also places where overflow is clearly impossible, e.g an instance where the a - b was being done on 24 bit values. Reviewed-by: Michael Niedermayer <michael@niedermayer.cc> Reviewed-by: Clément Bœsch <u@pkh.me> Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
2015-10-27Merge commit 'fe66671bd5f446f8d0a9c70968ba8fe891efe028'Hendrik Leppkes
* commit 'fe66671bd5f446f8d0a9c70968ba8fe891efe028': cmdutils: Check for and report the correct codec capability Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2015-10-26cmdutils: Check for and report the correct codec capabilityVittorio Giovara
2015-10-16Merge commit '9ef748173a4e0e58d40afaf38397783cd2537eaa'Hendrik Leppkes
* commit '9ef748173a4e0e58d40afaf38397783cd2537eaa': cmdutils: Print general codec capabilities Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2015-10-16Merge commit 'e240a28b20680b326a39b0860fda37d7e459bfc0'Hendrik Leppkes
* commit 'e240a28b20680b326a39b0860fda37d7e459bfc0': cmdutils: Add auto to threading capabilities report Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2015-10-15cmdutils: Print general codec capabilitiesVittorio Giovara
2015-10-15cmdutils: Add auto to threading capabilities reportVittorio Giovara
And use 'none' when such capabilities are not set. Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
2015-10-03cmdutils: silence unused warnings under --disable-swscale, --disable-swresampleGanesh Ajjanagadde
This patch silences such warnings by placing initializations under a header guard, see e.g http://fate.ffmpeg.org/log.cgi?time=20150919095430&log=compile&slot=x86_64-archlinux-gcc-disableswscale, http://fate.ffmpeg.org/log.cgi?time=20150919095048&log=compile&slot=x86_64-archlinux-gcc-disableswresample for examples of such warnings. It also has the benefit of placing library specific #defines next to each other. Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
2015-09-19cmdutils: Filter dst/srcw/hMichael Niedermayer
Dimensions / pixel formats for scaling must be set through the -s / pix_fmt options or the scale / format filters. Otherwise there are mismatches between whet is in/output to the scaler and for what the scaler is configured Fixes Ticket4856 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-08-12ffmpeg: replace deprecated av_log_ask_for_sample with av_logAndreas Cadhalpun
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc> Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
2015-08-08use avfilter_pad_get_{type,name} accessor functionsAndreas Cadhalpun
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc> Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
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: Fix overriding flags on the command line.Michael Niedermayer
Previously the code just appended the strings of flags which worked with "+bitexact" but would not work with something like "0" 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-27Merge commit 'def97856de6021965db86c25a732d78689bd6bb0'Michael Niedermayer
* commit 'def97856de6021965db86c25a732d78689bd6bb0': lavc: AV-prefix all codec capabilities Conflicts: cmdutils.c ffmpeg.c ffplay.c libavcodec/8svx.c libavcodec/aacenc.c libavcodec/ac3dec.c libavcodec/adpcm.c libavcodec/alac.c libavcodec/atrac3plusdec.c libavcodec/bink.c libavcodec/dnxhddec.c libavcodec/dvdec.c libavcodec/dvenc.c libavcodec/ffv1dec.c libavcodec/ffv1enc.c libavcodec/fic.c libavcodec/flacdec.c libavcodec/flacenc.c libavcodec/flvdec.c libavcodec/fraps.c libavcodec/frwu.c libavcodec/gifdec.c libavcodec/h261dec.c libavcodec/hevc.c libavcodec/iff.c libavcodec/imc.c libavcodec/libopenjpegdec.c libavcodec/libvo-aacenc.c libavcodec/libvorbisenc.c libavcodec/libvpxdec.c libavcodec/libvpxenc.c libavcodec/libx264.c libavcodec/mjpegbdec.c libavcodec/mjpegdec.c libavcodec/mpegaudiodec_float.c libavcodec/msmpeg4dec.c libavcodec/mxpegdec.c libavcodec/nvenc_h264.c libavcodec/nvenc_hevc.c libavcodec/pngdec.c libavcodec/qpeg.c libavcodec/ra288.c libavcodec/rv10.c libavcodec/s302m.c libavcodec/sp5xdec.c libavcodec/takdec.c libavcodec/tiff.c libavcodec/tta.c libavcodec/utils.c libavcodec/v210dec.c libavcodec/vp6.c libavcodec/vp9.c libavcodec/wavpack.c libavcodec/yop.c Merged-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-27lavc: AV-prefix all codec capabilitiesVittorio Giovara
Express bitfields more simply. Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
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-07-03lavu: add an API function to return the Libav version stringwm4
This returns something like "v12_dev0-1332-g333a27c". This is much more useful than the individual library versions, of which there are too many, and which are very hard to map back to releases or git commits. Signed-off-by: Janne Grunau <janne-libav@jannau.net>
2015-05-18cmdutils: Fix sign error in display matrix auto-rotation codeMichael Niedermayer
This makes the sample from Ticket4560 behave consistently with either branch Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-09cmdline: Check options array for not working flag combinationsMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-05cmdutils: Add libm.h for round()Michael Niedermayer
Found-by: jamrial Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-05cmdutils: move get_rotation() up in the fileJames Almer
Fixes compilation of fftools without libavdevice Signed-off-by: James Almer <jamrial@gmail.com>
2015-05-04cmdutils: Ask for a sample in case a odd rotation angle is encounteredMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-04ffplay&cmdutils:Factor get_rotation() code outMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-20Merge commit 'c253340ae6f74ffd8798bbd476e46d1b33a2d56e'Michael Niedermayer
* commit 'c253340ae6f74ffd8798bbd476e46d1b33a2d56e': log: Introduce a more verbose debug level Conflicts: doc/APIchanges doc/fftools-common-opts.texi libavutil/log.c libavutil/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-19log: Introduce a more verbose debug levelVittorio Giovara
And deprecate av_dlog macro.
2015-04-19cmdutils: indent protocols listingLou Logan
For readability. Signed-off-by: Lou Logan <lou@lrcd.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-03cmdutils: fix "Commmand" typoLou Logan
Signed-off-by: Lou Logan <lou@lrcd.com>
2015-03-20cmdutils: Add a stream specifier to map usable streamsLuca Barbato
It drops everything that cannot be used for re-encoding and/or streamcopy.
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>
2015-01-04cmdutils: update copyright year to 2015.Johan Andersson
Signed-off-by: Martin Storsjö <martin@martin.st>
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