Ganesh Ajjanagadde
254c64c574
cmdutils: silence unused warnings under --disable-swscale, --disable-swresample
...
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>
9 years ago
Michael Niedermayer
a0af9fd954
cmdutils: Filter dst/srcw/h
...
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>
9 years ago
Andreas Cadhalpun
9c29aa7143
ffmpeg: replace deprecated av_log_ask_for_sample with av_log
...
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
9 years ago
Andreas Cadhalpun
9126ae4b6b
use avfilter_pad_get_{type,name} accessor functions
...
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
9 years ago
Michael Niedermayer
5edab1d207
cmdutils: remove sws_opts usage, simplify code
...
It has become unused as all code was switched to AVDictionary
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
9 years ago
Michael Niedermayer
408c9cf0e2
cmdutils: Fix overriding flags on the command line.
...
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>
9 years ago
Michael Niedermayer
165fb7eba8
cmdutils: Export all sws options using a AVDictionary like the other subsystems do
...
This makes extracting options other than sws_flags easier
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
9 years ago
Vittorio Giovara
def97856de
lavc: AV-prefix all codec capabilities
...
Express bitfields more simply.
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
9 years ago
Anton Khirnov
bd2ab27c48
avconv: use read_file() for reading the 2pass stats
...
Also, drop the now unused cmdutils_read_file(). There is no reason to
have two functions doing essentially the same thing.
9 years ago
wm4
1316df7aa9
lavu: add an API function to return the Libav version string
...
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>
10 years ago
Michael Niedermayer
66f4b1e9c4
cmdutils: Fix sign error in display matrix auto-rotation code
...
This makes the sample from Ticket4560 behave consistently with either branch
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Michael Niedermayer
876c89a88f
cmdline: Check options array for not working flag combinations
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Michael Niedermayer
36993527dd
cmdutils: Add libm.h for round()
...
Found-by: jamrial
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
James Almer
858f81fde2
cmdutils: move get_rotation() up in the file
...
Fixes compilation of fftools without libavdevice
Signed-off-by: James Almer <jamrial@gmail.com>
10 years ago
Michael Niedermayer
f320f2f4c6
cmdutils: Ask for a sample in case a odd rotation angle is encountered
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Michael Niedermayer
4351c288b9
ffplay&cmdutils:Factor get_rotation() code out
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Vittorio Giovara
c253340ae6
log: Introduce a more verbose debug level
...
And deprecate av_dlog macro.
10 years ago
Lou Logan
d1a8922098
cmdutils: indent protocols listing
...
For readability.
Signed-off-by: Lou Logan <lou@lrcd.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Lou Logan
44cae91252
cmdutils: fix "Commmand" typo
...
Signed-off-by: Lou Logan <lou@lrcd.com>
10 years ago
Luca Barbato
342fc46c69
cmdutils: Add a stream specifier to map usable streams
...
It drops everything that cannot be used for re-encoding and/or
streamcopy.
10 years ago
Jean Delvare
194165aed8
cmdutils: fix success path
...
Since commit 934f2d2f5c
,
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>
10 years ago
Andreas Cadhalpun
103e4c5863
stop embedding the build date
...
Theis makes the build binary reproducible.
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Lukasz Marek
f463df18bc
cmdutils: use av_match_name to filter devices
...
Device name may be coma-separated list.
Use dedicated funtion to compare.
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
10 years ago
Lukasz Marek
44e6eeb30d
cmdutils: use helper functions for listing sinks/sources
...
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>
10 years ago
Michael Niedermayer
d2838f09d6
cmdutils.c: Use av_realloc_array()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Michael Niedermayer
369b4cd412
cmdutils: Use 64bit for file size/offset related variable in cmdutils_read_file()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Johan Andersson
3e16065221
cmdutils: update copyright year to 2015.
...
Signed-off-by: Martin Storsjö <martin@martin.st>
10 years ago
Vittorio Giovara
b1306823d0
check memory errors from av_strdup()
10 years ago
Vittorio Giovara
38129c26c5
cmdutils: check file access functions return values
...
CC: libav-stable@libav.org
Bug-Id: CID 703706
10 years ago
Lukasz Marek
00dc2859f0
cmdutils: use macros for device test
...
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
10 years ago
Michael Niedermayer
4be03a7a6c
cmdutils: Exit in case of faulty stream specifiers
...
Avoids printing confusing and unrelated errors
Fixes Ticket2772
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Lukasz Marek
5f55819850
opts: add list device sources/sinks options
...
Allows to list sources/sinks of the devices that implement
that functionality.
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
10 years ago
Michael Niedermayer
2fc970a6b8
cmdutils: Read errno before av_log() as the callback from av_log() might affect errno
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Luca Barbato
47e3e1097e
cmdutils: Use the correct guard
...
The OptionDef arrays are terminated with a { NULL } element not NULL.
CC: libav-stable@libav.org
Bug-Id: CID 703769
10 years ago
Diego Biurrun
2dd09ebf55
cmdutils: Print a more sensible message in show_filters() w/o libavfilter
...
Also avoid an unused variable warning for compilers w/o av_unused support.
10 years ago
Tobias Rapp
2c43cfe2d4
cmdutils: Add some whitespace when printing layouts
...
Adds some more whitespace between channel layout name and decomposition.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Michael Niedermayer
81a663f49e
Drop remaining unneeded != NULL
...
Reviewed-by: Clément Bœsch <u@pkh.me>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Gabriel Dume
4b1f5e5090
cosmetics: Write NULL pointer inequality checks more compactly
...
Signed-off-by: Diego Biurrun <diego@biurrun.de>
10 years ago
Gabriel Dume
f929ab0569
cosmetics: Write NULL pointer equality checks more compactly
...
Signed-off-by: Diego Biurrun <diego@biurrun.de>
10 years ago
Anton Khirnov
481a366749
cmdutils: allow matching by metadata in stream specifiers
10 years ago
Michael Niedermayer
7f5d75f95b
cmdutils: ignore sws_flags if swscale is not enabled
...
This avoids some failures during fate when swscale is disabled
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Simon Thelen
389d45351e
version string: add copyright line to version string
...
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>
11 years ago
Michael Niedermayer
d82ecfce07
cmdutils: implement FFREPORT=level=...
...
Fixes Ticket3057
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Lukasz Marek
8518da23f5
ffmpeg: add -devices param
...
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>
11 years ago
Michael Niedermayer
978c193d47
cmdutils: omit deprecated codec ids in help output
...
These ids should be meaningless for the end user and would only
confuse
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
tue46wsdgxfjrt
262ea965e7
cmdutils: preserve unchanged log flags when setting AV_LOG_SKIP_REPEATED
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
53487268e5
cmdutils: use av_mallocz_array()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
2b4543ff69
cmdutils/filter_codec_opts: do not discard all options for CODEC_ID_NONE
...
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>
11 years ago
Luca Barbato
81498ceb5b
avconv: Match stream id
...
Quite useful to select by pid in MPEG-TS.
11 years ago
Johan Andersson
7ce88e5ec4
cmdutils: update copyright year to 2014.
...
Signed-off-by: Martin Storsjö <martin@martin.st>
11 years ago