1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Commit Graph

90 Commits

Author SHA1 Message Date
Stefano Sabatini
4ae28eb853 showfiltfmts: use av_get_pix_fmt_name()
Use av_get_pix_fmt_name() rather than access
av_pix_fmt_descriptors. Improve readability.
2011-06-07 12:44:51 +02:00
Michael Niedermayer
f9569249c2 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  Remove some unused scripts from tools/.
  Add x86 assembly for some 10-bit H.264 intra predict functions.
  v4l2: do not force NTSC as standard
  Skip tableprint.h during 'make checkheaders'.
  Remove unnecessary LIBAVFORMAT_BUILD #ifdef.
  Drop explicit filenames from @file Doxygen tags.
  Skip generated table headers during 'make checkheaders'.
  lavf,lavc: free avoptions in a generic way.
  AVOptions: add av_opt_free convenience function.
  tableprint: Restore mistakenly deleted common.h #include for FF_ARRAY_ELEMS.
  tiff: print log in case of unknown / unsupported tag.
  tiff: fix linesize for mono-white/black formats.
  Fix build of eval-test program
  configure: Document --enable-vaapi
  ac3enc: extract all exponents for the frame at once

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-06-06 03:33:58 +02:00
Diego Biurrun
eb7505e429 Remove some unused scripts from tools/. 2011-06-06 01:31:02 +02:00
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