virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-26 19:01:44 +02:00
Code Issues Releases Activity
37,826 Commits 37 Branches 400 Tags 460 MiB
387783749f
Commit Graph

137 Commits

Author SHA1 Message Date
Michael Niedermayer
f8ae3a2108 Merge remote branch 'qatar/master' 
12 files changed, 36 insertions(+), 81 deletions(-)
yes thats 36 new lines in 14 commits

* qatar/master:
  ffmpeg: fix -aspect cli option
  Restructure video filter implementation in ffmpeg.c.
  ffplay: remove audio_write_get_buf_size() forward declaration
  lavfi: print key-frame and picture type information in ff_dlog_ref()
  mathops: remove ancient confusing comment
  cws2fws: Improve error message wording.
  tools: Check the return value of write().
  mpegaudio: move OUT_FMT macro to mpegaudiodec.c
  mpegaudio: remove OUT_MIN/MAX macros
  Add missing #includes to mp3_header_(de)compress bsf
  dct: fix indentation
  dct: bypass table allocation for DCT_II of size 32
  h264dsp_mmx: Add #ifdefs around some mmxext functions on x86_64.
  Remove unused header mpegaudio3.h.

Conflicts:
	ffmpeg.c
	libavcodec/mpegaudio.h
	libavcodec/mpegaudio3.h
	libavfilter/avfilter.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-05-17 04:51:33 +02:00
Diego Biurrun
c540061f3f cws2fws: Improve error message wording. 2011-05-16 20:56:56 +02:00
Diego Biurrun
d39facc783 tools: Check the return value of write(). 
This fixes several warnings of the type:
warning: ignoring return value of ‘write’, declared with attribute warn_unused_result
 2011-05-16 20:56:56 +02:00
Peter Ross
c7d22c5d67 patcheck: warn about assert usage 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2011-05-12 13:02:58 +02:00
Michael Niedermayer
7b376b398a Merge remote branch 'qatar/master' 
* qatar/master:
  Handle unicode file names on windows
  rtp: Rename the open/close functions to alloc/free
  Lowercase all ff* program names.
  Refer to ff* tools by their lowercase names.
NOT Pulled  Replace more FFmpeg instances by Libav or ffmpeg.
  Replace `` by $() syntax in shell scripts.
  patcheck: Allow overiding grep program(s) through environment variables.
NOT Pulled  Remove stray libavcore and _g binary references.
  vorbis: Rename decoder/encoder files to follow general file naming scheme.
  aacenc: Fix whitespace after last commit.
  cook: Fix small typo in av_log_ask_for_sample message.
  aacenc: Finish 3GPP psymodel analysis for non mid/side cases.
  Remove RDFT dependency from AAC decoder.
  Add some debug log messages to AAC extradata
  Fix mov debug (u)int64_t format strings.
  bswap: use native types for av_bwap16().
  doc: FLV muxing is supported.
  applehttp: Handle AES-128 encrypted streams
  Add a protocol handler for AES CBC decryption with PKCS7 padding
  doc: Mention that DragonFly BSD requires __BSD_VISIBLE set

Conflicts:
	ffplay.c
	ffprobe.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-04-24 03:41:22 +02:00
Diego Biurrun
6252040e77 Replace `` by $() syntax in shell scripts. 
$() is easier to nest and POSIX, which we require in other places.
 2011-04-23 17:45:05 +02:00
Brad
ff3be572ef patcheck: Allow overiding grep program(s) through environment variables. 
patcheck hardcodes the binary names for grep/egrep. This makes overriding the
binary names a pain, e.g. when calling a GNU version of grep on BSD systems.

Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2011-04-23 17:31:39 +02:00
Michael Niedermayer
2d2b5a1421 10l, commit that should have been stashed into the merge. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-04-17 23:59:00 +02:00
Michael Niedermayer
c40798441f Merge remote branch 'qatar/master' 
* qatar/master:
  ac3dec: fix processing of delta bit allocation information.
  vc1: fix fate-vc1 after previous commit.
  wmv3dec: fix playback of complex WMV3 files using simple_idct.
  make av_dup_packet() more cautious on allocation failures
  make containers pass palette change in AVPacket
  introduce side information for AVPacket

Politic commits that have not been pulled:
  Update regtest checksums after revision 6001dad.
  Replace more FFmpeg references by Libav.
  Replace references to ffmpeg-devel with libav-devel; fix roundup URL.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-04-17 23:43:54 +02:00
Diego Biurrun
14622ef05d Replace references to ffmpeg-devel with libav-devel; fix roundup URL. 2011-04-15 22:38:41 +02:00
Mans Rullgard
2912e87a6c Replace FFmpeg with Libav in licence headers 
Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-03-19 13:33:20 +00:00
Peter Ross
a96c0059d8 patcheck: warn about assert usage 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-03-18 18:49:36 +01:00
Stefano Sabatini
5d329e2eb7 In graph2dot, print more specific audio information for audio links. 
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
(cherry picked from commit 009026efb1)
 2011-02-18 19:52:25 +01:00
Stefano Sabatini
009026efb1 In graph2dot, print more specific audio information for audio links. 
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
 2011-02-17 00:02:11 +01:00
Janne Grunau
2c3589bfda consolidate .gitignore patters into a single file 
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
 2011-01-18 21:32:05 +01:00
Janne Grunau
348b8218f7 convert svn:ignore properties to .gitignore files 
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
 2011-01-17 15:50:14 +01:00
Stefano Sabatini
b382d1e3e4 Print link audio format name in tools/graph2dot. 
Originally committed as revision 26322 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2011-01-12 18:25:03 +00:00
Stefano Sabatini
24de0edbd5 Rename avfilter_destroy() as avfilter_free(). 
The new name is shorter and more consistent with the FFmpeg API, and
sounds less evil.

Originally committed as revision 25707 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-11-08 12:32:39 +00:00
Stefano Sabatini
1e80a0eaa4 Remove graphparser.h header, move AVFilterInOut and 
avfilter_graph_parse() declaration to libavfilter/avfiltergraph.h.

Simplify, and less confusing for the user.

Originally committed as revision 25705 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-11-07 22:56:29 +00:00
Stefano Sabatini
2a24df9357 Add avfilter_graph_config(). 
Originally committed as revision 25502 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-16 10:20:53 +00:00
Aurelien Jacobs
ad2d0fdf25 probetest: replace usage of deprecated first_iformat by av_iformat_next() 
Originally committed as revision 25490 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-15 14:44:18 +00:00
Stefano Sabatini
47453c0e37 Make graph2dot print information related to the link timebase. 
Originally committed as revision 25442 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-10 22:26:17 +00:00
Michael Niedermayer
54ce8a4c8b Clarify whitespace nitpicks in patcheck. 
Originally committed as revision 25435 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-10 19:35:17 +00:00
Michael Niedermayer
bf2d43de3f Tool to analyze multimedia files and create directories and symlinks for the 
container type and codecs in each file that point back to the file.

Originally committed as revision 25428 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-09 19:52:06 +00:00
Michael Niedermayer
f47d172f13 Check for more 'indent -kr' whitespace details. 
Originally committed as revision 25417 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-08 19:11:36 +00:00
Stefano Sabatini
a8542e433e Set the correct type for the output links. 
Originally committed as revision 24810 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-08-17 18:07:57 +00:00
Stefano Sabatini
84c0386960 Change avfilter_open() signature, from: 
AVFilterContext *avfilter_open(AVFilter *filter, const char *inst_name);
to:
int avfilter_open(AVFilterContext **filter_ctx, AVFilter *filter, const char *inst_name);

This way it is possible to propagate an error code telling the reason
of the failure.

Originally committed as revision 24765 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-08-11 11:44:51 +00:00
Måns Rullgård
56e0d112d3 showfiltfmts: destroy filter context before exit 
Originally committed as revision 24722 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-08-06 22:25:44 +00:00
Måns Rullgård
c61f84bf97 showfiltfmts: set media type of links to that of corresponding pad 
Originally committed as revision 24721 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-08-06 22:25:42 +00:00
Benoit Fouet
3ea4d9423f Issue a warning when fed with misformatted one-line doxygen comments. 
Originally committed as revision 24660 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-08-02 07:23:47 +00:00
Måns Rullgård
27971664d3 lavfi-showfiltfmts: print one format per line 
Originally committed as revision 24647 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-08-01 11:34:56 +00:00
Michael Niedermayer
78db142acb Warn about "/** text" comments. 
Originally committed as revision 24574 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-07-28 15:03:05 +00:00
Rafaël Carré
09d7da865f Accept stdin as input for patcheck. 
Patch by Rafaël Carré, rafael d carre a gmail

Originally committed as revision 24499 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-07-25 15:02:27 +00:00
Rafaël Carré
2543c7fb1a grep Changelog entry from unified diffs 
Patch by Rafaël Carré, rafael d carre a gmail

Originally committed as revision 24248 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-07-15 12:05:53 +00:00
Michael Niedermayer
c4e12a9fa4 Check for doxy filetag with filename 
Originally committed as revision 23975 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-07-02 11:13:23 +00:00
Eli Friedman
35614edb2d Add patcheck checks for assignments that look like compound assignments 
Patch by Eli Friedman, eli dot friedman at gmail

Originally committed as revision 23841 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-06-28 08:02:24 +00:00
Baptiste Coudurier
91a4abd8f5 fail if input and output are the same 
Originally committed as revision 23672 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-06-21 01:05:30 +00:00
Benoit Fouet
b6c265ec2b Improve rule for possibly never read variables. 
Originally committed as revision 23578 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-06-11 08:58:40 +00:00
Stefano Sabatini
e34d5db595 Add libavfilter 1-input - 1-output regression test, corresponding to the 
target regtest-lavfi_pix_fmts.

The lavfi_pix_fmts test is disabled, this because there are
many tests which are failing, and there are still some output files
which cannot be played by NUT/ffplay.

Originally committed as revision 23297 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-05-24 20:38:50 +00:00
Martin Storsjö
86e09922a5 qt-faststart: Abort scanning of the input file if a badly sized atom is encountered 
If the atom size is 0, qt-faststart currently hangs forever while scanning
the file.

Originally committed as revision 23129 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-05-13 19:22:56 +00:00
Martin Storsjö
2ef9fd8e9b Cosmetics: Initialize pointers with NULL instead of 0, for consistency 
Originally committed as revision 23127 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-05-13 19:18:27 +00:00
Martin Storsjö
e3d7269fc8 Cosmetics: reindent 
Originally committed as revision 23126 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-05-13 19:17:49 +00:00
Martin Storsjö
c937454d89 qt-faststart: Use the error_out cleanup code path for all error returns 
Originally committed as revision 23125 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-05-13 19:17:15 +00:00
Martin Storsjö
6ad533b7cb qt-faststart: Avoid leaking memory if encountering a file with double ftyp atoms 
Originally committed as revision 23065 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-05-09 17:46:42 +00:00
Martin Storsjö
d296a658cf qt-faststart: Free ftyp_atom at all exit points 
Originally committed as revision 23008 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-05-01 21:05:28 +00:00
Martin Storsjö
331cb6c3e8 Reindent after the previous commit 
Originally committed as revision 23007 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-05-01 21:03:52 +00:00
Martin Storsjö
d50fc2d07b Remove unnecessary checks before calling free 
Feel free to revert if you can specify a concrete case where this actually
is necessary.

Originally committed as revision 23006 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-05-01 21:02:23 +00:00
Jean-Daniel Dupas
cc947f04cc Replace all occurences of PKT_FLAG_KEY with AV_PKT_FLAG_KEY. 
Patch by Jean-Daniel Dupas, devlists shadowlab org

Originally committed as revision 22744 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-31 12:29:58 +00:00
Daniel Verkamp
4a0cf686f8 patcheck: Escape parentheses in grep calls 
Originally committed as revision 22563 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-15 23:32:20 +00:00
Diego Biurrun
f19a068ef6 Add missing stdlib.h #include, fixes the warnings: 
tools/trasher.c:44: warning: implicit declaration of function ‘atoi’
tools/trasher.c:53: warning: implicit declaration of function ‘abs’

Originally committed as revision 22328 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-08 17:00:21 +00:00
Michael Niedermayer
5988dc9eec Remove apparently unneeded define and includes. 
Originally committed as revision 22229 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-06 01:32:52 +00:00
Michael Niedermayer
47cf98efcb Make trasher use a well defined random number generator and allow the seed to be specified on the cmd line. 
Originally committed as revision 22228 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-06 01:31:17 +00:00
Stefano Sabatini
11ab237e31 Add the graph2dot tools and document it. 
Also link avfiltergraph.o and graphparser.o against libavfilter, as it
uses them.

Originally committed as revision 22063 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-25 19:55:01 +00:00
Reimar Döffinger
260dfb1a3c patcheck: check that pix_fmt etc. initializers are const 
Originally committed as revision 20493 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-11-09 23:12:44 +00:00
Diego Biurrun
9407246d7a Drop argc/argv parameters from main(), they are unused. 
Originally committed as revision 19907 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-18 10:14:46 +00:00
Diego Biurrun
497559ec90 cosmetics: K&R coding style, prettyprinting 
Originally committed as revision 19906 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-18 10:13:10 +00:00
Martin Storsjö
ff19d438dc Init i to 0 (10l fix). 
Patch by Martin Storsjö / martin von martin aus st

Originally committed as revision 19855 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-15 13:09:34 +00:00
Michael Niedermayer
6e7ef5ec35 Probetest, to test the demuxers probe functions against random and not so random 
input.

Originally committed as revision 19853 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-15 10:42:01 +00:00
Frank Barchard
65b875d8fc print atom info during parsing, patch by Frank Barchard, fbarchard at google dot com 
Originally committed as revision 19435 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-07-15 08:57:27 +00:00
Frank Barchard
31457d7a2e Do not fail if 'uuid' atom is encountered before 'moov'. 
Patch by Frank Barchard, fbarchard at google dot com.

Originally committed as revision 19354 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-07-06 05:36:14 +00:00
Frank Barchard
06a497afab Use slightly more appropriate format strings for printing decimal values. 
patch by Frank Barchard, fbarchard google com

Originally committed as revision 19315 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-07-01 13:46:26 +00:00
Frank Barchard
cb28f95454 Use more portable 'PRId64' instead of 'llx' as conversion/length specifier. 
patch by Frank Barchard, fbarchard google com

Originally committed as revision 19309 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-06-30 15:11:51 +00:00
Zdenek Kabelac
92147b6bec Use new packet reading API, fixes a memory leak. 
patch by Zdenek Kabelac, zdenek.kabelac gmail com

Originally committed as revision 18728 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-05-01 21:39:53 +00:00
Michael Niedermayer
9e793a2462 Check for INIT_VLC_USE_STATIC 
Originally committed as revision 18200 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-27 03:03:50 +00:00
Diego Biurrun
6510c453ab Add _XOPEN_SOURCE #define. This is necessary for (s)random(), which are XSI 
extensions of POSIX. Avoids implicit declaration warnings on some systems.

Originally committed as revision 18178 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-24 16:28:48 +00:00
Alex Converse
f11c9ee996 patcheck: Replace non-POSIX echo -e with printf. 
Originally committed as revision 17943 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-11 19:13:15 +00:00
Michael Niedermayer
70ec53a0bf Detect static prototypes. 
Originally committed as revision 17649 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-27 21:11:49 +00:00
Michael Niedermayer
f55e1812d0 Improve detection of non doxy comments. 
Originally committed as revision 17648 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-27 21:08:32 +00:00
Michael Niedermayer
0f485a9c8b Fix misdetection of #else in 'missing } prior to else'. 
Originally committed as revision 17647 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-27 18:33:46 +00:00
Michael Niedermayer
214ee5f556 Search for things like "int *src" without const. 
Originally committed as revision 17529 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-22 14:29:48 +00:00
Michael Niedermayer
6c25f34682 Fix @param[in/out] handling 
Originally committed as revision 17395 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-17 18:20:06 +00:00
Michael Niedermayer
be3e68b277 Check for duplicate const/static/inline. 
Originally committed as revision 17101 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-09 18:37:29 +00:00
Michael Niedermayer
74892f7a4e Fix reserved identifer detection so it doesnt detect __asm and such. 
Originally committed as revision 17057 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-08 13:34:22 +00:00
Michael Niedermayer
3d8f9025b1 Factorize grep -v cases. 
Originally committed as revision 17056 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-08 13:30:34 +00:00
Michael Niedermayer
6c2dd77eb2 Patch check script. 
Note, before you flame me that its dirty, i did post it to ffmpeg-dev and
asked for a review and threatened to commit.

Originally committed as revision 17055 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-08 12:55:17 +00:00
Diego Biurrun
3ef6182556 Fix #include path, headers from other directories need to have 
the directory name prefixed now.

Originally committed as revision 14868 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-08-20 21:58:05 +00:00
Matthieu Castet
4a8361f848 tools/trasher: Don't mix srand/rand and srandom/random interface. 
patch by matthieu castet, castet.matthieu free fr

Originally committed as revision 14222 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-07-13 21:44:00 +00:00
Mike Melanson
3c16e03dbc correct build documentation for qt-faststart utility 
Originally committed as revision 13199 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-19 04:57:57 +00:00
Diego Biurrun
6878026ada Add '#undef strcat' to fix compilation. 
Originally committed as revision 11529 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-01-14 22:22:19 +00:00
Diego Biurrun
c33820e52e Add LGPL license header. 
Originally committed as revision 11490 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-01-10 10:26:57 +00:00
Mike Melanson
90527811d7 Error checking: make sure that there are 3 parameters and that the 
file open operation succeeds.

Originally committed as revision 11479 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-01-09 00:29:49 +00:00
Diego Biurrun
e36f0f03cc Remove unused variable i. 
Originally committed as revision 11474 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-01-08 22:57:03 +00:00
Michael Niedermayer
0f340f8fc5 A little proggy i wrote years ago. 
This simply writes burts of random data into a file. Great for testing error
robustness/resilience/concealment.

Originally committed as revision 11459 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-01-08 00:54:19 +00:00
Benoit Fouet
1f48345af4 remove warnings 
Originally committed as revision 9741 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-07-18 15:38:04 +00:00
Benoit Fouet
21f41fa667 revert my accidental previous commit 
Originally committed as revision 9713 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-07-17 08:29:59 +00:00
Benoit Fouet
83ef1fea65 fix tools compilation 
Originally committed as revision 9712 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-07-17 08:28:48 +00:00
Måns Rullgård
c07ed8c8a2 create and populate "tools" directory 
Originally committed as revision 9634 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-07-13 21:33:24 +00:00