Michael Niedermayer
faba79e080
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
mxfdec: Include FF_INPUT_BUFFER_PADDING_SIZE when allocating extradata.
H.264: tweak some other x86 asm for Atom
probe: Fix insane flow control.
mpegts: remove invalid error check
s302m: use nondeprecated audio sample format API
lavc: use designated initialisers for all codecs.
x86: cabac: add operand size suffixes missing from 6c32576
Conflicts:
libavcodec/ac3enc_float.c
libavcodec/flacenc.c
libavcodec/frwu.c
libavcodec/pictordec.c
libavcodec/qtrleenc.c
libavcodec/v210enc.c
libavcodec/wmv2dec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-07-30 06:46:08 +02:00
Anton Khirnov
ec6402b7c5
lavc: use designated initialisers for all codecs.
...
It's more readable and less prone to breakage.
2011-07-29 08:42:34 +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
Stefano Sabatini
5d6e4c160a
Replace deprecated symbols SAMPLE_FMT_* with AV_SAMPLE_FMT_*, and enum
...
SampleFormat with AVSampleFormat.
Originally committed as revision 25730 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-11-12 11:04:40 +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
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
Thilo Borgmann
7a00bbad21
Implement avcodec_decode_video2(), _audio3() and _subtitle2() which takes an
...
AVPacket argument rather than a const uint8_t *buf + int buf_size. This allows
passing of packet-specific flags from demuxer to decoder, such as the keyframe
flag, which appears necessary to playback corePNG P-frames.
Patch by Thilo Borgmann thilo.borgmann googlemail com, see also the thread
"Google Summer of Code participation" on the mailinglist.
Originally committed as revision 18351 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-07 15:59:50 +00:00
Diego Biurrun
bad5537e2c
Use full internal pathname in doxygen @file directives.
...
Otherwise doxygen complains about ambiguous filenames when files exist
under the same name in different subdirectories.
Originally committed as revision 16912 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-01 02:00:19 +00:00
Vitor Sessak
da708eaa22
Cosmetics: rename mace3_decode_frame() to mace_decode_frame()
...
Originally committed as revision 15569 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-10-05 20:12:20 +00:00
Vitor Sessak
10c1d19212
Avoid code duplication between mace3_decode_frame() and mace6_decode_frame()
...
Originally committed as revision 15568 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-10-05 20:06:40 +00:00
Vitor Sessak
b0e047de15
Use a for() instead of triplicating code.
...
Originally committed as revision 15566 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-10-05 16:33:43 +00:00
Vitor Sessak
3a54087733
Factorize duplicate table reading code.
...
Originally committed as revision 15564 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-10-05 14:36:10 +00:00
Vitor Sessak
955bcc2102
Convert two tables to signed decimal
...
Originally committed as revision 15290 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-09 19:20:20 +00:00
Vitor Sessak
90c6805ac4
Cosmetics: remove useless parentheses
...
Originally committed as revision 15288 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-09 16:51:39 +00:00
Vitor Sessak
710428c4ec
Remove ChannelData.lev var and use ChannelData.level instead
...
Originally committed as revision 15287 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-09 16:50:11 +00:00
Vitor Sessak
42fe17a018
Check output buffer size before decoding.
...
Originally committed as revision 15257 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-07 20:21:15 +00:00
Vitor Sessak
d636f0cc39
Cosmetics: rename vars s/ctx/chd/
...
Originally committed as revision 15256 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-07 20:18:18 +00:00
Vitor Sessak
f36aec3b5e
Exploit symmetry to reduce size of tables by half.
...
Originally committed as revision 15255 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-07 17:20:55 +00:00
Vitor Sessak
b8a5f62144
Cosmetics: s/short/int16_t/
...
Originally committed as revision 15253 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-07 14:33:01 +00:00
Vitor Sessak
b1547a7817
Remove cast, now tables are signed.
...
Originally committed as revision 15252 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-07 14:32:10 +00:00
Vitor Sessak
fc1d3e004f
Convert tables to signed and decimal.
...
Originally committed as revision 15251 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-07 14:30:54 +00:00
Vitor Sessak
e7ff335935
Remove unused table entries.
...
Originally committed as revision 15250 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-07 13:55:26 +00:00
Vitor Sessak
934bc927a8
Remove commented out code.
...
Originally committed as revision 15249 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-07 13:47:30 +00:00
Vitor Sessak
f9f7210e5e
Use FFMIN() instead of rewriting it.
...
Originally committed as revision 15248 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-07 13:46:09 +00:00
Vitor Sessak
42c7aeea67
Factorize broken clipping in its own function and document it.
...
Originally committed as revision 15247 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-07 13:42:34 +00:00
Vitor Sessak
5659156760
Cosmetics: whitespace/linebreaks
...
Originally committed as revision 15246 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-07 09:55:47 +00:00
Vitor Sessak
c8e0861e49
Use the same 8 bit -> 16 bit conversion as QuickTime.
...
Originally committed as revision 15245 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-07 09:46:55 +00:00
Vitor Sessak
4ea70242a8
Do not share context variables between channels and do not zero them at
...
decode_frame(). This makes the output much closer to that of the binary decoder.
Originally committed as revision 15244 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-07 09:42:57 +00:00
Vitor Sessak
b6d544f54e
Remove output pointer from context
...
Originally committed as revision 15243 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-07 09:38:37 +00:00
Vitor Sessak
e10049bef5
Cosmetics: indent after last commit and remove useless braces
...
Originally committed as revision 15214 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-05 00:01:23 +00:00
Vitor Sessak
1b0dc0120d
Simplify: use a for instead of unrolling by hand
...
Originally committed as revision 15213 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-05 00:00:20 +00:00
Vitor Sessak
fb17d9ff54
Functions mace{3,6}_decode_frame() are just wrappers to Exp1to{3,6}(). This commit
...
moves the code of Exp1to* to the decode functions.
Originally committed as revision 15212 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-04 23:54:57 +00:00
Vitor Sessak
78df225866
Simplify: use two distinct functions to decode MACE3 and MACE6, since the
...
previous mace_decode_init() function was almost just a switch statement.
Originally committed as revision 15208 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-04 23:18:28 +00:00
Vitor Sessak
b97c413832
Simplify mace_decode_frame()
...
Originally committed as revision 15207 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-04 23:12:20 +00:00
Vitor Sessak
647148c638
Remove useless comments
...
Originally committed as revision 15205 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-04 23:02:08 +00:00
Vitor Sessak
251d75f292
Reindent mace.c, its indentation was completly inconsistent with the coding rules.
...
Originally committed as revision 15204 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-04 23:00:34 +00:00
Peter Ross
fd76c37fd9
Modify all codecs to report their supported input and output sample format(s).
...
Originally committed as revision 14482 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-31 10:47:31 +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
Stefano Sabatini
d5202e4fda
Add long names to many AVCodec declarations.
...
patch by Stefano Sabatini, stefano.sabatini-lala poste it
Originally committed as revision 13005 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-27 10:52:44 +00:00
Zuxy Meng
98a6fff98c
Apply 'cold' attribute to init/uninit functions in libavcodec
...
Originally committed as revision 12525 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-21 03:11:20 +00:00
Michael Niedermayer
b1f5712e3c
consts
...
Originally committed as revision 11706 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-01 02:36:09 +00:00
Diego Biurrun
f9cac0a778
Replace puts() by dprintf where appropriate.
...
Originally committed as revision 11547 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-17 08:30:06 +00:00
Diego Biurrun
b78e7197a8
Change license headers to say 'FFmpeg' instead of 'this program/this library'
...
and fix GPL/LGPL version mismatches.
Originally committed as revision 6577 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-10-07 15:30:46 +00:00
Alan Curry
afd1a2d88e
Fix buffer handling for stereo mace files, fixes some random sig11
...
Patch by Alan Curry !<! pacman !@! TheWorld !.! com !>!
Originally committed as revision 6178 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-09-05 21:17:30 +00:00
Diego Biurrun
5509bffa88
Update licensing information: The FSF changed postal address.
...
Originally committed as revision 4842 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-01-12 22:43:26 +00:00
Diego Biurrun
115329f160
COSMETICS: Remove all trailing whitespace.
...
Originally committed as revision 4749 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-12-17 18:14:38 +00:00
François Revol
3c8e39f72d
Stereo MACE fix by Burkhard Plaum <plaum AT ipf DOT uni-stuttgart DOT de>
...
Still doesn't work with our mov demuxer though...
Originally committed as revision 3919 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-02-01 15:13:27 +00:00
Michael Niedermayer
53db1cae1c
data_size = 0 cleanup
...
Originally committed as revision 3146 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-05-21 14:37:16 +00:00