virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity
74,089 Commits 37 Branches 400 Tags 465 MiB
94d68a41fa
Commit Graph

515 Commits

Author SHA1 Message Date
Michael Niedermayer
edd110ee45 Merge commit 'bd2ab27c488ae92c7820efe11d4f53d84e94d58e' 
* 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-19 13:33:44 +02:00
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.
 2015-07-19 09:37:11 +02:00
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>
 2015-07-02 23:22:53 +02:00
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>
 2015-05-18 02:07:34 +02:00
Michael Niedermayer
876c89a88f cmdline: Check options array for not working flag combinations 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-09 13:07:21 +02:00
Michael Niedermayer
36993527dd cmdutils: Add libm.h for round() 
Found-by: jamrial
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-05 11:51:00 +02:00
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>
 2015-05-05 02:47:21 -03:00
Michael Niedermayer
f320f2f4c6 cmdutils: Ask for a sample in case a odd rotation angle is encountered 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-04 17:39:23 +02:00
Michael Niedermayer
4351c288b9 ffplay&cmdutils:Factor get_rotation() code out 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-03 23:49:16 +02:00
Michael Niedermayer
8e8219e0f0 Merge commit 'c253340ae6f74ffd8798bbd476e46d1b33a2d56e' 
* 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-20 02:48:19 +02:00
Vittorio Giovara
c253340ae6 log: Introduce a more verbose debug level 
And deprecate av_dlog macro.
 2015-04-19 12:41:59 +01:00
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>
 2015-04-19 02:05:22 +02:00
Lou Logan
44cae91252 cmdutils: fix "Commmand" typo 
Signed-off-by: Lou Logan <lou@lrcd.com>
 2015-04-03 10:43:21 -08:00
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.
 2015-03-20 16:10:20 +01:00
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>
 2015-02-11 17:28:11 +01:00
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>
 2015-02-02 05:04:14 +01:00
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>
 2015-01-11 18:58:33 +01:00
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>
 2015-01-11 18:58:33 +01:00
Michael Niedermayer
d2838f09d6 cmdutils.c: Use av_realloc_array() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-06 17:52:54 +01:00
Michael Niedermayer
369b4cd412 cmdutils: Use 64bit for file size/offset related variable in cmdutils_read_file() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-06 15:27:17 +01:00
Johan Andersson
3e16065221 cmdutils: update copyright year to 2015. 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2015-01-04 13:22:25 +02:00
Michael Niedermayer
988d27b802 Merge commit 'b1306823d0b3ae998c8e10ad832004eb13bdd93e' 
* 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-19 04:57:25 +01:00
Michael Niedermayer
934f2d2f5c Merge commit '38129c26c51b933d7db423f904ba0cd6a88ca1ed' 
* commit '38129c26c51b933d7db423f904ba0cd6a88ca1ed':
  cmdutils: check file access functions return values

Conflicts:
	cmdutils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-12-19 04:31:17 +01:00
Vittorio Giovara
b1306823d0 check memory errors from av_strdup() 2014-12-18 23:27:14 +01:00
Vittorio Giovara
38129c26c5 cmdutils: check file access functions return values 
CC: libav-stable@libav.org
Bug-Id: CID 703706
 2014-12-18 23:23:00 +01:00
Lukasz Marek
00dc2859f0 cmdutils: use macros for device test 
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
 2014-12-14 23:55:41 +01:00
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>
 2014-11-17 04:06:32 +01:00
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>
 2014-10-25 20:20:31 +02:00
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>
 2014-10-25 13:28:51 +02:00
Michael Niedermayer
1eda312aca Merge commit '47e3e1097e09da7f973908e09df15e3bb7c5e1f4' 
* commit '47e3e1097e09da7f973908e09df15e3bb7c5e1f4':
  cmdutils: Use the correct guard

Conflicts:
	cmdutils.c

See: 35daf3ca81
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-10-17 14:57:40 +02:00
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
 2014-10-17 09:55:46 +01:00
Michael Niedermayer
9ac08d93b2 Merge commit '2dd09ebf5597fd5e4a573bee9cccf21ae821f286' 
* 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-17 19:59:10 +02:00
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.
 2014-09-16 09:37:14 -07:00
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>
 2014-09-02 18:44:07 +02:00
Michael Niedermayer
81a663f49e Drop remaining unneeded != NULL 
Reviewed-by: Clément Bœsch <u@pkh.me>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-15 22:47:45 +02:00
Michael Niedermayer
60dbed6067 Merge commit '4b1f5e5090abed6c618c8ba380cd7d28d140f867' 
* 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-15 21:26:12 +02:00
Michael Niedermayer
fb33bff990 Merge commit 'f929ab0569ff31ed5a59b0b0adb7ce09df3fca39' 
* 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-15 21:00:50 +02:00
Gabriel Dume
4b1f5e5090 cosmetics: Write NULL pointer inequality checks more compactly 
Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2014-08-15 05:34:13 -07:00
Gabriel Dume
f929ab0569 cosmetics: Write NULL pointer equality checks more compactly 
Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2014-08-15 03:18:18 -07:00
Anton Khirnov
481a366749 cmdutils: allow matching by metadata in stream specifiers 2014-08-13 17:24:18 +00:00
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>
 2014-06-29 17:27:23 +02:00
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>
 2014-06-16 10:24:28 -08:00
Michael Niedermayer
d82ecfce07 cmdutils: implement FFREPORT=level=... 
Fixes Ticket3057

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-06-14 22:54:32 +02:00
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>
 2014-05-28 03:52:50 +02:00
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>
 2014-04-29 22:13:35 +02:00
tue46wsdgxfjrt
262ea965e7 cmdutils: preserve unchanged log flags when setting AV_LOG_SKIP_REPEATED 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-26 19:21:59 +02:00
Michael Niedermayer
53487268e5 cmdutils: use av_mallocz_array() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-08 15:44:32 +02:00
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>
 2014-03-28 17:29:26 +01:00
Luca Barbato
81498ceb5b avconv: Match stream id 
Quite useful to select by pid in MPEG-TS.
 2014-03-13 11:59:34 +01:00
Johan Andersson
7ce88e5ec4 cmdutils: update copyright year to 2014. 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2014-01-05 22:39:35 +02:00