1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-18 03:19:31 +02:00
Commit Graph

39 Commits

Author SHA1 Message Date
Michael Niedermayer
988f585fcb Merge remote-tracking branch 'qatar/master'
* qatar/master: (44 commits)
  replacement Indeo 3 decoder
  gsm demuxer: do not allocate packet twice.
  flvenc: use first packet delay as global delay.
  ac3enc: doxygen update.
  imc: return error codes instead of 0 for error conditions.
  imc: return meaningful error codes instead of -1
  imc: do not set channel layout for stereo
  imc: validate channel count
  imc: check for ff_fft_init() failure
  imc: check output buffer size before decoding
  imc: use DSPContext.bswap16_buf() to byte-swap packet data
  rtsp: add allowed_media_types option
  libgsm: add flush function to reset the decoder state when seeking
  libgsm: simplify decoding by using a loop
  gsm: log error message when packet is too small
  libgsmdec: do not needlessly set *data_size to 0
  gsmdec: do not needlessly set *data_size to 0
  gsmdec: add flush function to reset the decoder state when seeking
  libgsmdec: check output buffer size before decoding
  gsmdec: log error message when output buffer is too small.
  ...

Conflicts:
	Changelog
	ffplay.c
	libavcodec/indeo3.c
	libavcodec/mjpeg_parser.c
	libavcodec/vp3.c
	libavformat/cutils.c
	libavformat/id3v2.c
	libavutil/parseutils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-03 02:16:26 +01:00
Diego Biurrun
2f5df0b12c Replace ffmpeg references with more accurate libav* references. 2011-11-02 10:42:55 +01: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
6001dad6e2 Replace more FFmpeg references by Libav. 2011-04-17 19:31:49 +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
Diego Elio Pettenò
e7e2df27f8 Add ff_ prefix to data symbols of encoders, decoders, hwaccel, parsers, bsf.
None of these symbols should be accessed directly, so declare them as
hidden.

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit d36beb3f69)
2011-01-28 03:15:34 +01:00
Diego Elio Pettenò
d36beb3f69 Add ff_ prefix to data symbols of encoders, decoders, hwaccel, parsers, bsf.
None of these symbols should be accessed directly, so declare them as
hidden.

Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-01-26 16:08:45 +00:00
Måns Rullgård
49bd8e4b84 Fix grammar errors in documentation
Originally committed as revision 23904 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-30 15:38:06 +00:00
Howard Chu
784824a68c Use AV_BASE64_SIZE() macro
Originally committed as revision 23462 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-04 01:15:41 +00:00
Diego Biurrun
ba87f0801d Remove explicit filename from Doxygen @file commands.
Passing an explicit filename to this command is only necessary if the
documentation in the @file block refers to a file different from the
one the block resides in.

Originally committed as revision 22921 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-04-20 14:45:34 +00:00
Diego Biurrun
4311ff776b cosmetics: Switch Doxygen comments to JavaDoc style.
Originally committed as revision 22919 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-04-20 14:23:00 +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
David Conrad
a4914ac708 Clarify comment: although still hacky, it is correct for existing libtheora
Originally committed as revision 20817 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-12-12 20:18:49 +00:00
David Conrad
c39b94be60 libtheoraenc.c: mark keyframes
Originally committed as revision 20816 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-12-12 20:18:46 +00:00
David Conrad
800841fd0c Support compiling against libtheora older than 1.1
Originally committed as revision 20609 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-11-25 16:00:14 +00:00
David Conrad
6c2289b52e Set colorspace for libtheora encoding
Originally committed as revision 20583 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-11-22 21:08:46 +00:00
David Conrad
af89b1781f Support 4:2:2 and 4:4:4 subsampling in libtheora encoding
Originally committed as revision 20582 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-11-22 21:08:43 +00:00
David Conrad
b0a6d9ca86 Add support for two pass encoding in libtheora
Originally committed as revision 20581 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-11-22 21:08:40 +00:00
David Conrad
bdc8c48893 Update libtheora wrapper to use the 1.0 API
Originally committed as revision 20580 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-11-22 21:08:37 +00:00
Diego Biurrun
96ff02f1b4 Get rid of some pointless '== NULL' / '!= 0' conditions in if statements.
Originally committed as revision 20325 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-10-19 22:26:52 +00:00
Diego Biurrun
8767fb4cad whitespace cosmetics: prettyprinting, K&R style
Originally committed as revision 20313 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-10-19 15:51:34 +00:00
Diego Biurrun
11eb3cea73 Remove pointless parentheses.
Originally committed as revision 20311 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-10-19 15:14:00 +00:00
Reimar Döffinger
3bb984987c Hack: set the coded frame PTS to the incoming PTS.
This is not correct, but libtheora does not seem to provide a way
to get the correct value, and this is necessary to make encoding
produce sensible time stamps when encoded content is variable
FPS or the time base is simply different from FPS.
Somewhat fixes issue 1197.

Originally committed as revision 20199 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-10-10 14:43:31 +00:00
David Conrad
6945c2bc4c Support constant-quant encoding for libtheora
Based on a patch by j f (gonzaz-z # operamail (d) com)

Originally committed as revision 20109 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-09-30 22:25:49 +00:00
David Conrad
3e962f315b Fix "warning: assignment discards qualifiers from pointer target type"
Originally committed as revision 19424 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-07-13 01:59:48 +00:00
Art Clarke
870ee6f715 Fix memory leak in libtheora encoder
Patch by Art Clarke [aclark , xuggle . com]

Originally committed as revision 19423 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-07-13 01:59:45 +00:00
David Conrad
cc0aae4343 Fix libtheora encoding for non-mod16 sizes
Originally committed as revision 18899 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-05-22 22:01:50 +00:00
Daniel Verkamp
5ef251e504 Add missing av_cold in static init/close functions.
Patch by Daniel Verkamp daniel at drv dot nu.

Originally committed as revision 17526 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-22 13:48:55 +00:00
Diego Biurrun
99ed41a808 Fix filenames in Doxygen comments.
Originally committed as revision 16811 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-26 22:51:16 +00:00
Stefano Sabatini
d9513de67c Add missing inclusion of libavutil/intreadwrite.h, fix compilation when
libtheora is enabled.

Originally committed as revision 16562 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-11 23:26:52 +00:00
Stefano Sabatini
fe4bf37455 Make AVCodec long_names definition conditional depending on CONFIG_SMALL.
Originally committed as revision 13759 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-12 21:50:13 +00:00
Carl Eugen Hoyos
eacced45c4 Replace some occurrences of -1 with PIX_FMT_NONE.
Fixes icc warning : enumerated type mixed with another type

Originally committed as revision 13130 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-11 22:28:43 +00:00
Diego Biurrun
245976da2a Use full path for #includes from another directory.
Originally committed as revision 13098 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-09 11:56:36 +00:00
Stefano Sabatini
162d4fc99d Add long names to AVCodec declarations.
patch by Stefano Sabatini, stefano.sabatini-lala poste it

Originally committed as revision 13009 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-27 22:39:51 +00:00
Diego Biurrun
e5a389a1b7 license header consistency cosmetics
Originally committed as revision 9484 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-07-05 10:40:25 +00:00
Ramiro Polla
2c124cb65c Use AV_xx throughout libavcodec
Originally committed as revision 9169 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-06-02 01:41:07 +00:00
Diego Biurrun
013591c5f2 Add a comment about swapped numerator and denominator.
Originally committed as revision 7871 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-02-07 14:10:50 +00:00
Diego Biurrun
150d27725b Theora encoding via libtheora.
courtesy of Paul Richards, paul.richards gmail com

Originally committed as revision 7698 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-25 00:16:28 +00:00