virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-21 10:55:51 +02:00
Code Issues Releases Activity
27,685 Commits 37 Branches 400 Tags 458 MiB
7ffe76e540
Commit Graph

139 Commits

Author SHA1 Message Date
Reinhard Tartler
7ffe76e540 Merge libavcore into libavutil 
Done to keep ABI compatible. Otherwise this is just silly
 2011-02-16 23:00:30 +01:00
Nicolas George
76ad67cae7 Implement guessed_pts in avcodec_decode_video2 
Signed-off-by: Nicolas George <nicolas.george@normalesup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-02-07 19:32:07 +01:00
James Zern
3f171f5aec cmdutils: fix codec-specific options from preset 
Using a preset file caused the address of a stack variable to be stored
in opt_names/values. This change causes the strings to be dup'd then
freed in uninit_opts.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit 60ff9de6ff)
 2011-02-06 20:31:45 +01:00
James Zern
ba3517aa6f cmdutils: fix opt_values leak 
Add free to uninit_opts and relocate opt_names to same

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit 3a6a9cdf5b)
 2011-02-06 20:31:45 +01:00
Diego Elio Pettenò
7a0e1be839 Make this_year static to cmdutils.c 
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 3568853f63)
 2011-01-26 03:43:29 +01:00
Georgi Chorbadzhiyski
9256dc28ab libavcodec minor version is > 99 so fix the formating 
libavcodec minor version is > 99 so when printing the library versions
the output is a little bit broken:

  libavutil    50. 36. 0 / 50.36. 0
  libavcore     0. 16. 1 /  0.16. 1
  libavcodec   52.108. 0 / 52.108. 0
  libavformat  52. 94. 0 / 52.94. 0
  libavdevice  52.  2. 3 / 52. 2. 3
  libavfilter   1. 74. 0 /  1.74. 0
  libswscale    0. 12. 0 /  0.12. 0

Change the formating to look like this:

  libavutil    50. 36. 0 / 50. 36. 0
  libavcore     0. 16. 1 /  0. 16. 1
  libavcodec   52.108. 0 / 52.108. 0
  libavformat  52. 94. 0 / 52. 94. 0
  libavdevice  52.  2. 3 / 52.  2. 3
  libavfilter   1. 74. 0 /  1. 74. 0
  libswscale    0. 12. 0 /  0. 12. 0

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit c0dd565304)
 2011-01-21 20:36:00 +01:00
Mans Rullgard
324e7ee260 Use INFINITY and NAN macros instead of 1/0 and 0/0 2011-01-18 20:48:23 +00:00
Stefano Sabatini
be4876eae9 Disable initialization of the swscale sws_opts context in 
cmdutils.c:init_opts(), in the case libswscale compilation is not
enabled.

Fix ffprobe and ffserver compilation with --disable-swscale.

Originally committed as revision 26212 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2011-01-04 14:00:06 +00:00
Martin Storsjö
f03424a782 Reindent 
Originally committed as revision 26205 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2011-01-03 12:43:48 +00:00
Anssi Hannula
ef2b2243dc Use AVOption for muxers in ffmpeg. 
Patch by Anssi Hannula, anssi d hannula d iki d fi

Originally committed as revision 26199 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2011-01-02 16:00:47 +00:00
Justin Ruggles
391fa56ddb Update current year to 2011. Happy New Year! 
Originally committed as revision 26184 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2011-01-01 18:49:18 +00:00
Stefano Sabatini
819e2ab0d8 Add missing check on the existence of avcodec_opts[AVMEDIA_TYPE_X], 
fix crash in ffprobe.

Originally committed as revision 25799 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-11-22 22:03:21 +00:00
Stefano Sabatini
6e872935db Implement get_preset_file() in cmdutils.h and use it to factorize code 
from ffmpeg.c and ffserver.c.

Originally committed as revision 25679 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-11-04 23:07:04 +00:00
Stefano Sabatini
ff0652e503 Implement a common get_filtered_video_frame(), shared between ffplay.c 
and ffmpeg.c.

Originally committed as revision 25520 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-18 13:57:11 +00:00
Stefano Sabatini
f7ead94c69 Factorize definition of the output_filter defined in both ffplay.c and 
ffmpeg.c.
Replace it with a more generic definition which can be shared.

Originally committed as revision 25453 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-12 18:40:26 +00:00
Reimar Döffinger
a5c33faacc Add init and uninit functions to cmdutils, reduces code duplication 
between ffmpeg and ffplay and avoids a valgrind error by freeing
avformat_opts->key.

Originally committed as revision 25309 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-02 08:44:33 +00:00
Michael Niedermayer
0093ebc20a User application side of Codec specific parameters. 
Originally committed as revision 25266 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-09-29 23:06:51 +00:00
Alexander Strange
01d461980e All else being equal, prefer PTS over DTS in timestamp correction 
Because DTS values aren't passed through decoders, they tend to be
inaccurate if decoder delay doesn't match what was expected by the encoder.

In particular this improves timestamps for H.264 without num_reorder_frames
set and with -strict 1, which causes DTS to be up to 16 frames ahead of the
picture.

Note that this doesn't really improve any file with very broken PTS/DTS,
since PTS isn't much more accurate in these.

Originally committed as revision 25242 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-09-28 03:45:27 +00:00
Alexander Strange
7a8bfa5d67 Extract timestamp correction code from ffplay.c to cmdutils.c 
Originally committed as revision 25241 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-09-28 02:05:12 +00:00
Stefano Sabatini
20e021c711 Add more missing checks in opt_default(), prevent a crash if 
avcodec_opts[0] or avformat_opts is not set.

Originally committed as revision 25186 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-09-25 01:31:59 +00:00
Stefano Sabatini
d860aaf8cd Add missing existence checks in opt_default(). 
Originally committed as revision 25179 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-09-24 16:32:08 +00:00
Stefano Sabatini
1790d3b330 Move log_callback_help to cmdutils.[hc], for allowing sharing. 
Originally committed as revision 25149 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-09-20 21:48:03 +00:00
Stefano Sabatini
2ee5c78967 Extend show_protocols() to make it print information about input, 
output, seek support.

Originally committed as revision 24581 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-07-29 22:38:28 +00:00
Stefano Sabatini
65dd2ded3f Factorize indent definition in PRINT_LIB_INFO(). 
Originally committed as revision 24435 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-07-22 13:05:10 +00:00
Stefano Sabatini
d101e731cf Merge maybe_print_config() and PRINT_LIB_CONFIG() in PRINT_LIB_INFO(). 
Originally committed as revision 24434 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-07-22 13:05:07 +00:00
Stefano Sabatini
1044a92a5e Rename: 
PRINT_LIB_VERSION()      -> PRINT_LIB_INFO()
print_all_lib_versions() -> print_all_libs_info()

Originally committed as revision 24433 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-07-22 13:05:04 +00:00
Stefano Sabatini
b6525b4b2a Reindent. 
Originally committed as revision 24432 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-07-22 13:05:01 +00:00
Stefano Sabatini
208749a0dd Increase flexibility of PRINT_LIB_VERSION(), make it accept a flags 
parameter. Allow a pending factorization.

Originally committed as revision 24431 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-07-22 13:04:58 +00:00
Stefano Sabatini
aac6ca6978 Add libavcore. 
The new library is meant to contain the core multimedia utilities for
FFmpeg, to make them shareable between more libav* libraries.

See thread:
Subject: [FFmpeg-devel] [RFC] New library for shared non-generic libav* utils
Date: Fri, 9 Jul 2010 01:07:40 +0200

Originally committed as revision 24393 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-07-21 18:28:42 +00:00
Stefano Sabatini
25e25617f6 Make all the numeric options accept in input an expression which is 
evaluated through av_strtod().

Fix roundup issue #551.

Originally committed as revision 23556 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-06-09 21:28:53 +00:00
Ramiro Polla
c56e9e05ab Open 2-pass logfile in binary mode for both reading and writing. 
This fixes a regression on Windows introduced by r22769 in which the data read
from the file was not properly zero terminated. The file was read as text,
which caused the \r characters to be suppressed. Since the zero termination
happens at the end of the buffer, and there was one byte less read per line,
this caused the remaining space on the buffer to contain random data.

Originally committed as revision 23251 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-05-22 21:32:57 +00:00
Måns Rullgård
e24db3e391 Fix build with swscale disabled 
Originally committed as revision 23062 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-05-09 12:04:48 +00:00
Stefano Sabatini
9e94bd3e80 Reindent after the last commit. 
Originally committed as revision 23034 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-05-05 21:45:00 +00:00
Stefano Sabatini
10173c0e58 Simplify print_error(), directly use av_strerror()/strerror() for 
printing the error code associated to FF_NETERROR(EPROTONOSUPPORT).

Originally committed as revision 23033 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-05-05 21:44:57 +00:00
Stefano Sabatini
735ef67b9d Make print_error() use strerror() in case av_strerror() fails. 
Should provide a meaningful error message for systems which do not
support strerror_r().

Fix roundup issue #1894.

Originally committed as revision 23032 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-05-05 21:44:54 +00:00
Ramiro Polla
adef229efb AVERROR(FF_NETERROR(x)) -> FF_NETERROR(x) 
FF_NETERROR is implicitly an AVERROR.

Originally committed as revision 22888 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-04-16 00:20:11 +00:00
Stefano Sabatini
458b062d61 Implement cmdutils.c:read_file(), and use it in ffmpeg.c for reading 
the second pass encoding log file.

Originally committed as revision 22769 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-04-01 22:34:22 +00:00
Stefano Sabatini
330d86f593 Issue a more general message when the function which sets an option 
fails.

It may fail not only because of an invalid value for the option, but
also for other reasons, e.g. memory problems etc.

Originally committed as revision 22738 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-30 23:46:30 +00:00
Stefano Sabatini
72415b2adb Define AVMediaType enum, and use it instead of enum CodecType, which 
is deprecated and will be dropped at the next major bump.

Originally committed as revision 22735 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-30 23:30:55 +00:00
Stefano Sabatini
7a5bdd79eb Use av_strerror() in print_error(). 
Originally committed as revision 22696 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-26 22:46:47 +00:00
Stefano Sabatini
8bab85e54c Remove printing of frame sizes and frame rate abbreviations from 
show_protocols().

The list of abbreviations is both outdated and out of context.

Originally committed as revision 22589 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-17 23:51:12 +00:00
Måns Rullgård
6580d5e377 Remove hacks not required since HAVE_AV_CONFIG_H was unset for the apps 
Originally committed as revision 22295 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-07 22:18:37 +00:00
Stefano Sabatini
da033b05ab Make opt_default() look for options in sws_opts only if sws_opts is 
defined, fix crash.

Originally committed as revision 22232 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-06 14:09:35 +00:00
Stefano Sabatini
33bc794738 Make opt_default() print an error message and exit if the option 
supplied is not recognized.

Originally committed as revision 21960 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-22 12:28:51 +00:00
Stefano Sabatini
13887093fa FFmpeg is a collective effort so allowing a single name in a banner is 
not nice/fair towards the community of developers.

Also this looks like the best way for resolving the debate about which
is the one person name to be put in the banner.

See the thread:
Subject: [FFmpeg-devel] [PATCH] Replace "Fabrice Bellard" with "the FFmpeg developers" in  the banner
Date: Thu, 11 Feb 2010 23:59:12 +0100

Originally committed as revision 21885 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-18 20:47:20 +00:00
Stefano Sabatini
9cb5c760d7 Extend show_pix_fmts(), make it show input/output support for 
conversion and other information exposed by the pixdesc API.

Originally committed as revision 21751 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-10 23:36:35 +00:00
Måns Rullgård
0104b608ca Check for setrlimit() 
Originally committed as revision 21733 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-09 22:55:11 +00:00
Stefano Sabatini
9e5381a21b Make parse_options() explicitely handle the case where an opt_func2 
function returns a negative value, rather than erroneously trigger the
code which manages the case of unknown option.

Originally committed as revision 21670 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-07 15:46:18 +00:00
Stefano Sabatini
695f7de6a4 Declare variable "version" in the PRINT_LIB_VERSION() macro if block, 
slightly simpler and more robust.

Originally committed as revision 21492 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-27 23:08:43 +00:00
Måns Rullgård
5116571dcd Prettify PRINT_LIB_VERSION macro 
Originally committed as revision 21477 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-27 12:58:26 +00:00