summaryrefslogtreecommitdiff
path: root/cmdutils.c
Commit message (Collapse)AuthorAgeFilesLines
* cmdutils: silence unused warnings under --disable-swscale, --disable-swresampleGanesh Ajjanagadde2015-10-031-3/+6
| | | | | | | | | | | 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>
* cmdutils: Filter dst/srcw/hMichael Niedermayer2015-09-191-0/+6
| | | | | | | | | | 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>
* ffmpeg: replace deprecated av_log_ask_for_sample with av_logAndreas Cadhalpun2015-08-121-1/+4
| | | | | Reviewed-by: Michael Niedermayer <michael@niedermayer.cc> Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
* use avfilter_pad_get_{type,name} accessor functionsAndreas Cadhalpun2015-08-081-2/+2
| | | | | Reviewed-by: Michael Niedermayer <michael@niedermayer.cc> Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
* cmdutils: remove sws_opts usage, simplify codeMichael Niedermayer2015-08-081-24/+0
| | | | | | It has become unused as all code was switched to AVDictionary Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* cmdutils: Fix overriding flags on the command line.Michael Niedermayer2015-08-081-1/+1
| | | | | | | 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>
* cmdutils: Export all sws options using a AVDictionary like the other ↵Michael Niedermayer2015-08-081-4/+20
| | | | | | | | subsystems do This makes extracting options other than sws_flags easier Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* Merge commit 'def97856de6021965db86c25a732d78689bd6bb0'Michael Niedermayer2015-07-271-11/+11
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
| * lavc: AV-prefix all codec capabilitiesVittorio Giovara2015-07-271-9/+9
| | | | | | | | | | | | Express bitfields more simply. Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
* | Merge commit 'bd2ab27c488ae92c7820efe11d4f53d84e94d58e'Michael Niedermayer2015-07-191-58/+0
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | * 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>
| * avconv: use read_file() for reading the 2pass statsAnton Khirnov2015-07-191-55/+0
| | | | | | | | | | Also, drop the now unused cmdutils_read_file(). There is no reason to have two functions doing essentially the same thing.
| * lavu: add an API function to return the Libav version stringwm42015-07-021-1/+1
| | | | | | | | | | | | | | | | 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>
* | cmdutils: Fix sign error in display matrix auto-rotation codeMichael Niedermayer2015-05-181-1/+1
| | | | | | | | | | | | This makes the sample from Ticket4560 behave consistently with either branch Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | cmdline: Check options array for not working flag combinationsMichael Niedermayer2015-05-091-0/+12
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | cmdutils: Add libm.h for round()Michael Niedermayer2015-05-051-0/+1
| | | | | | | | | | Found-by: jamrial Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | cmdutils: move get_rotation() up in the fileJames Almer2015-05-051-24/+24
| | | | | | | | | | | | Fixes compilation of fftools without libavdevice Signed-off-by: James Almer <jamrial@gmail.com>
* | cmdutils: Ask for a sample in case a odd rotation angle is encounteredMichael Niedermayer2015-05-041-0/+3
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffplay&cmdutils:Factor get_rotation() code outMichael Niedermayer2015-05-031-0/+23
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'c253340ae6f74ffd8798bbd476e46d1b33a2d56e'Michael Niedermayer2015-04-201-0/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | * 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>
| * log: Introduce a more verbose debug levelVittorio Giovara2015-04-191-0/+1
| | | | | | | | And deprecate av_dlog macro.
| * cmdutils: Add a stream specifier to map usable streamsLuca Barbato2015-03-201-0/+22
| | | | | | | | | | It drops everything that cannot be used for re-encoding and/or streamcopy.
| * cmdutils: update copyright year to 2015.Johan Andersson2015-01-041-1/+1
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | cmdutils: indent protocols listingLou Logan2015-04-191-2/+2
| | | | | | | | | | | | | | For readability. Signed-off-by: Lou Logan <lou@lrcd.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | cmdutils: fix "Commmand" typoLou Logan2015-04-031-1/+1
| | | | | | | | Signed-off-by: Lou Logan <lou@lrcd.com>
* | cmdutils: fix success pathJean Delvare2015-02-111-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | stop embedding the build dateAndreas Cadhalpun2015-02-021-2/+1
| | | | | | | | | | | | | | Theis makes the build binary reproducible. Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | cmdutils: use av_match_name to filter devicesLukasz Marek2015-01-111-4/+4
| | | | | | | | | | | | | | Device name may be coma-separated list. Use dedicated funtion to compare. Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
* | cmdutils: use helper functions for listing sinks/sourcesLukasz Marek2015-01-111-25/+2
| | | | | | | | | | | | | | | | 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>
* | cmdutils.c: Use av_realloc_array()Michael Niedermayer2015-01-061-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | cmdutils: Use 64bit for file size/offset related variable in ↵Michael Niedermayer2015-01-061-1/+1
| | | | | | | | | | | | cmdutils_read_file() Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'b1306823d0b3ae998c8e10ad832004eb13bdd93e'Michael Niedermayer2014-12-191-1/+9
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | * commit 'b1306823d0b3ae998c8e10ad832004eb13bdd93e': check memory errors from av_strdup() Conflicts: avprobe.c libavformat/matroskaenc.c libavutil/opt.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * check memory errors from av_strdup()Vittorio Giovara2014-12-181-1/+9
| |
* | Merge commit '38129c26c51b933d7db423f904ba0cd6a88ca1ed'Michael Niedermayer2014-12-191-9/+22
|\ \ | |/ | | | | | | | | | | | | | | | | * commit '38129c26c51b933d7db423f904ba0cd6a88ca1ed': cmdutils: check file access functions return values Conflicts: cmdutils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * cmdutils: check file access functions return valuesVittorio Giovara2014-12-181-5/+23
| | | | | | | | | | CC: libav-stable@libav.org Bug-Id: CID 703706
* | cmdutils: use macros for device testLukasz Marek2014-12-141-6/+1
| | | | | | | | Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
* | cmdutils: Exit in case of faulty stream specifiersMichael Niedermayer2014-11-171-1/+1
| | | | | | | | | | | | | | Avoids printing confusing and unrelated errors Fixes Ticket2772 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | opts: add list device sources/sinks optionsLukasz Marek2014-10-251-0/+181
| | | | | | | | | | | | | | Allows to list sources/sinks of the devices that implement that functionality. Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
* | cmdutils: Read errno before av_log() as the callback from av_log() might ↵Michael Niedermayer2014-10-251-4/+7
| | | | | | | | | | | | affect errno Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '47e3e1097e09da7f973908e09df15e3bb7c5e1f4'Michael Niedermayer2014-10-171-1/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | * commit '47e3e1097e09da7f973908e09df15e3bb7c5e1f4': cmdutils: Use the correct guard Conflicts: cmdutils.c See: 35daf3ca8173f80f200860e06a410ced31a8b360 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * cmdutils: Use the correct guardLuca Barbato2014-10-171-1/+1
| | | | | | | | | | | | | | The OptionDef arrays are terminated with a { NULL } element not NULL. CC: libav-stable@libav.org Bug-Id: CID 703769
* | Merge commit '2dd09ebf5597fd5e4a573bee9cccf21ae821f286'Michael Niedermayer2014-09-171-2/+4
|\ \ | |/ | | | | | | | | | | | | | | | | * commit '2dd09ebf5597fd5e4a573bee9cccf21ae821f286': cmdutils: Print a more sensible message in show_filters() w/o libavfilter Conflicts: cmdutils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * cmdutils: Print a more sensible message in show_filters() w/o libavfilterDiego Biurrun2014-09-161-2/+4
| | | | | | | | Also avoid an unused variable warning for compilers w/o av_unused support.
* | cmdutils: Add some whitespace when printing layoutsTobias Rapp2014-09-021-4/+4
| | | | | | | | | | | | Adds some more whitespace between channel layout name and decomposition. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Drop remaining unneeded != NULLMichael Niedermayer2014-08-151-1/+1
| | | | | | | | | | Reviewed-by: Clément Bœsch <u@pkh.me> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '4b1f5e5090abed6c618c8ba380cd7d28d140f867'Michael Niedermayer2014-08-151-1/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
| * cosmetics: Write NULL pointer inequality checks more compactlyGabriel Dume2014-08-151-1/+1
| | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>
* | Merge commit 'f929ab0569ff31ed5a59b0b0adb7ce09df3fca39'Michael Niedermayer2014-08-151-4/+4
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
| * cosmetics: Write NULL pointer equality checks more compactlyGabriel Dume2014-08-151-4/+4
| | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>
| * cmdutils: allow matching by metadata in stream specifiersAnton Khirnov2014-08-131-0/+23
| |
| * avconv: Match stream idLuca Barbato2014-03-131-0/+6
| | | | | | | | Quite useful to select by pid in MPEG-TS.
View Lorry Controller Status