| Commit message (Collapse) | Author | Age | Files | Lines |
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
* commit 'bd2ab27c488ae92c7820efe11d4f53d84e94d58e':
avconv: use read_file() for reading the 2pass stats
Conflicts:
cmdutils.c
cmdutils.h
ffmpeg_opt.c
Merged-by: Michael Niedermayer <[email protected]>
|
| |
| |
| |
| |
| | |
Also, drop the now unused cmdutils_read_file(). There is no reason to
have two functions doing essentially the same thing.
|
| |
| |
| |
| |
| |
| |
| |
| | |
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 <[email protected]>
|
| |
| |
| |
| |
| |
| | |
This makes the sample from Ticket4560 behave consistently with either branch
Signed-off-by: Michael Niedermayer <[email protected]>
|
| |
| |
| |
| | |
Signed-off-by: Michael Niedermayer <[email protected]>
|
| |
| |
| |
| |
| | |
Found-by: jamrial
Signed-off-by: Michael Niedermayer <[email protected]>
|
| |
| |
| |
| |
| |
| | |
Fixes compilation of fftools without libavdevice
Signed-off-by: James Almer <[email protected]>
|
| |
| |
| |
| | |
Signed-off-by: Michael Niedermayer <[email protected]>
|
| |
| |
| |
| | |
Signed-off-by: Michael Niedermayer <[email protected]>
|
|\|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
* 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 <[email protected]>
|
| |
| |
| |
| | |
And deprecate av_dlog macro.
|
| |
| |
| |
| |
| | |
It drops everything that cannot be used for re-encoding and/or
streamcopy.
|
| |
| |
| |
| | |
Signed-off-by: Martin Storsjö <[email protected]>
|
| |
| |
| |
| |
| |
| |
| | |
For readability.
Signed-off-by: Lou Logan <[email protected]>
Signed-off-by: Michael Niedermayer <[email protected]>
|
| |
| |
| |
| | |
Signed-off-by: Lou Logan <[email protected]>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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 <[email protected]>
Cc: Michael Niedermayer <[email protected]>
Signed-off-by: Michael Niedermayer <[email protected]>
|
| |
| |
| |
| |
| |
| |
| | |
Theis makes the build binary reproducible.
Signed-off-by: Andreas Cadhalpun <[email protected]>
Signed-off-by: Michael Niedermayer <[email protected]>
|
| |
| |
| |
| |
| |
| |
| | |
Device name may be coma-separated list.
Use dedicated funtion to compare.
Signed-off-by: Lukasz Marek <[email protected]>
|
| |
| |
| |
| |
| |
| |
| |
| | |
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 <[email protected]>
|
| |
| |
| |
| | |
Signed-off-by: Michael Niedermayer <[email protected]>
|
| |
| |
| |
| |
| |
| | |
cmdutils_read_file()
Signed-off-by: Michael Niedermayer <[email protected]>
|
|\|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
* commit 'b1306823d0b3ae998c8e10ad832004eb13bdd93e':
check memory errors from av_strdup()
Conflicts:
avprobe.c
libavformat/matroskaenc.c
libavutil/opt.c
Merged-by: Michael Niedermayer <[email protected]>
|
| | |
|
|\|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
* commit '38129c26c51b933d7db423f904ba0cd6a88ca1ed':
cmdutils: check file access functions return values
Conflicts:
cmdutils.c
Merged-by: Michael Niedermayer <[email protected]>
|
| |
| |
| |
| |
| | |
CC: [email protected]
Bug-Id: CID 703706
|
| |
| |
| |
| | |
Signed-off-by: Lukasz Marek <[email protected]>
|
| |
| |
| |
| |
| |
| |
| | |
Avoids printing confusing and unrelated errors
Fixes Ticket2772
Signed-off-by: Michael Niedermayer <[email protected]>
|
| |
| |
| |
| |
| |
| |
| | |
Allows to list sources/sinks of the devices that implement
that functionality.
Signed-off-by: Lukasz Marek <[email protected]>
|
| |
| |
| |
| |
| |
| | |
affect errno
Signed-off-by: Michael Niedermayer <[email protected]>
|
|\|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
* commit '47e3e1097e09da7f973908e09df15e3bb7c5e1f4':
cmdutils: Use the correct guard
Conflicts:
cmdutils.c
See: 35daf3ca8173f80f200860e06a410ced31a8b360
Merged-by: Michael Niedermayer <[email protected]>
|
| |
| |
| |
| |
| |
| |
| | |
The OptionDef arrays are terminated with a { NULL } element not NULL.
CC: [email protected]
Bug-Id: CID 703769
|
|\|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
* commit '2dd09ebf5597fd5e4a573bee9cccf21ae821f286':
cmdutils: Print a more sensible message in show_filters() w/o libavfilter
Conflicts:
cmdutils.c
Merged-by: Michael Niedermayer <[email protected]>
|
| |
| |
| |
| | |
Also avoid an unused variable warning for compilers w/o av_unused support.
|
| |
| |
| |
| |
| |
| | |
Adds some more whitespace between channel layout name and decomposition.
Signed-off-by: Michael Niedermayer <[email protected]>
|
| |
| |
| |
| |
| | |
Reviewed-by: Clément Bœsch <[email protected]>
Signed-off-by: Michael Niedermayer <[email protected]>
|
|\|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
* 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 <[email protected]>
|
| |
| |
| |
| | |
Signed-off-by: Diego Biurrun <[email protected]>
|
|\|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
* 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 <[email protected]>
|
| |
| |
| |
| | |
Signed-off-by: Diego Biurrun <[email protected]>
|
| | |
|
| |
| |
| |
| | |
Quite useful to select by pid in MPEG-TS.
|
| |
| |
| |
| | |
Signed-off-by: Martin Storsjö <[email protected]>
|
| |
| |
| |
| |
| |
| | |
This avoids some failures during fate when swscale is disabled
Signed-off-by: Michael Niedermayer <[email protected]>
|
| |
| |
| |
| |
| |
| |
| | |
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 <[email protected]>
|
| |
| |
| |
| |
| |
| | |
Fixes Ticket3057
Signed-off-by: Michael Niedermayer <[email protected]>
|
| |
| |
| |
| |
| |
| |
| |
| | |
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 <[email protected]>
Signed-off-by: Michael Niedermayer <[email protected]>
|
| |
| |
| |
| |
| |
| |
| | |
These ids should be meaningless for the end user and would only
confuse
Signed-off-by: Michael Niedermayer <[email protected]>
|
| |
| |
| |
| | |
Signed-off-by: Michael Niedermayer <[email protected]>
|
| |
| |
| |
| | |
Signed-off-by: Michael Niedermayer <[email protected]>
|
| |
| |
| |
| |
| |
| |
| | |
This fixes cases where the codec is detect later than the stream creation
No testcase with unmodified source known
Signed-off-by: Michael Niedermayer <[email protected]>
|