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
Kostya Shishkov
2d8591c27e
make containers pass palette change in AVPacket
...
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2011-04-15 18:02:05 +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
Daniel Kang
2843502ea4
Check for invalid decode op-codes, fixes issue 2522.
...
Patch by Daniel Kang, daniel.d.kang at gmail
Originally committed as revision 26295 to svn://svn.ffmpeg.org/ffmpeg/trunk
2011-01-10 10:47:10 +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
Kostya Shishkov
da93766858
16-bit Interplay video does not need palette control
...
Originally committed as revision 20936 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-12-27 14:07:21 +00:00
Kostya Shishkov
a69be798dc
Add missing opcodes for 16-bit Interplay Video decoding and finally enable it
...
Originally committed as revision 20934 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-12-27 09:12:50 +00:00
Kostya Shishkov
dcfb0cad68
16-bit Interplay Video stores motion vector data at the end of frame,
...
so initialize data pointers for 16-bit variant and read motion vectors
as supposed in corresponding opcodes.
Originally committed as revision 20933 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-12-27 09:03:31 +00:00
Kostya Shishkov
e09cdc7206
10l trocadero: forgot one case where picture linesize should be used
...
Originally committed as revision 20932 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-12-27 08:56:06 +00:00
Kostya Shishkov
5b8ebb3f41
cosmetics: reindent and break long lines after last commits
...
Originally committed as revision 20931 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-12-27 08:53:02 +00:00
Kostya Shishkov
5a8cf39e31
Add 16-bit image data handling (but not decoding yet) to Interplay Video
...
Originally committed as revision 20930 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-12-27 08:49:32 +00:00
Kostya Shishkov
80fec3ffd0
Use frame linesize in Interplay Video block copying function
...
Originally committed as revision 20929 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-12-27 08:38:07 +00:00
Kostya Shishkov
80ca19f766
Make CHECK_STREAM_PTR macro in Interplay Video decoder usable with
...
non-default pointers, it will be useful for checking motion values
data in 16-bit variant of this codec.
Originally committed as revision 20928 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-12-27 08:31:39 +00:00
Kostya Shishkov
8badb23e22
Recognize 16-bit Interplay Video variant
...
Originally committed as revision 20927 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-12-27 08:21:40 +00:00
Kostya Shishkov
9156a5ad72
Change main loop in Interplay Video decoder, so variables x and y really mean
...
coordinates, not offsets.
Originally committed as revision 20926 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-12-27 08:15:19 +00:00
Kostya Shishkov
0fb669ae9e
cosmetics: reindent
...
Originally committed as revision 20919 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-12-25 17:13:05 +00:00
Måns Rullgård
3aab27b459
Remove useless #include <unistd.h> from many files
...
Originally committed as revision 19499 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-07-22 23:37:53 +00:00
Reimar Döffinger
6000439ca4
Simplify ipvideo_decode_opcodes by using get_bits, this might be slower
...
but is not performance-critical anyway.
Originally committed as revision 18593 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-17 19:28:36 +00:00
Reimar Döffinger
28ab90edde
Remove unused code_counts array from interplavideo.c.
...
Originally committed as revision 18592 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-17 19:21:50 +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
Reimar Döffinger
8514f8427f
Fix ipvideo_decode_block_opcode_0xD again.
...
Originally committed as revision 18289 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-31 22:28:36 +00:00
Reimar Döffinger
dd9630e40f
Cosmetics: remove some pointless {}
...
Originally committed as revision 18284 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-31 19:39:47 +00:00
Reimar Döffinger
993a442315
Slightly simplify ipvideo_decode_block_opcode_0xD
...
Originally committed as revision 18283 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-31 19:36:44 +00:00
Reimar Döffinger
49a20ffabc
One more simplification for ipvideo_decode_block_opcode_0xA
...
Originally committed as revision 18282 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-31 19:18:13 +00:00
Reimar Döffinger
5e8b83ac3b
Slightly simplify first part of ipvideo_decode_block_opcode_0xA,
...
hopefully allows for further simplifications in the future.
Originally committed as revision 18280 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-31 18:48:31 +00:00
Reimar Döffinger
283531a81e
Make ipvideo_decode_block_opcode_0x8 a lot simpler by decoding the pixels
...
in a more natural order.
Originally committed as revision 18277 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-31 18:35:19 +00:00
Reimar Döffinger
4472ad2cc4
Fix a too small CHECK_STREAM_PTR value in interplayvideo.c
...
Originally committed as revision 18276 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-31 18:23:52 +00:00
Reimar Döffinger
f02bd7e49c
Avoid the last two uses of bitmasks in interplayvideo
...
Originally committed as revision 18272 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-31 14:48:14 +00:00
Reimar Döffinger
3f300d7e25
100l, fix FATE test broken by r18264
...
Originally committed as revision 18271 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-31 14:44:46 +00:00
Reimar Döffinger
9aaacc246a
Reindent
...
Originally committed as revision 18270 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-31 14:10:45 +00:00
Reimar Döffinger
1548839e51
Deduplicate code by moving it outside the if/else
...
Originally committed as revision 18269 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-31 14:06:22 +00:00
Reimar Döffinger
268a618ba6
Rearrange how the different cases are checked to reduce the number of
...
comparisons and allow further simplifications.
Originally committed as revision 18268 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-31 14:04:54 +00:00
Reimar Döffinger
0448b78b97
Avoid "reloading" code by using a 64 bit type for the flags and loading all at once.
...
Originally committed as revision 18266 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-31 13:58:40 +00:00
Reimar Döffinger
3766b9e0a8
Remove now pointless temporary pix variables.
...
Originally committed as revision 18265 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-31 13:33:55 +00:00
Reimar Döffinger
0312b77ccd
Slightly simplify part of ipvideo_decode_block_opcode_0x8
...
Originally committed as revision 18264 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-31 13:30:42 +00:00
Reimar Döffinger
51e350284d
Fix indentation
...
Originally committed as revision 18263 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-31 13:21:41 +00:00
Reimar Döffinger
9be06a0ed1
Avoid code duplication by using ?: and array indexing instead of if..else
...
Originally committed as revision 18262 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-31 13:21:10 +00:00
Reimar Döffinger
32eea24e9a
Prettify some assignments
...
Originally committed as revision 18261 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-31 12:57:03 +00:00
Reimar Döffinger
e3114eb1bb
Get rid of some pointless bitmask/shifter variables in interplayvideo.c
...
Originally committed as revision 18260 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-31 12:44:35 +00:00
Reimar Döffinger
aadf88119e
Merge the 3 COPY_FROM_* macros with lots of duplicated code into a single
...
copy_from function.
Originally committed as revision 18225 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-29 18:15:02 +00:00
Reimar Döffinger
a1f6ffd44d
Change CHECK_STREAM_PTR macro to correctly handle the (extremely unlikely)
...
overflow case.
Originally committed as revision 18224 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-29 17:50:46 +00:00
Reimar Döffinger
3017d8e9d7
Simplify check for leftover bytes after decoding for interplayvideo.
...
Originally committed as revision 18223 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-29 17:42:03 +00:00
Reimar Döffinger
49da3b7df2
Get rid of pointless "B" array in interplayvideo decoder.
...
Originally committed as revision 18222 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-29 17:35:22 +00:00
Reimar Döffinger
03b269ddc2
Replace many tiny loops in the interplayvideo decoder by memset, memcpy
...
or initializers.
Originally committed as revision 18221 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-29 17:23:40 +00:00
Reimar Döffinger
fff6077917
Make ipvideo_decode_block array constant, compile-time initialized instead
...
of initializing it each time the decoder is initialized.
Originally committed as revision 18219 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-29 17:15:42 +00:00
Reimar Döffinger
6d08f6c911
100l, interplayvideo uses 8x8 blocks, so call the 8x8 put_pixels_tab function
...
instead of the 16x16 one. Seems to fix decoding on PPC.
Originally committed as revision 17808 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-04 18:18:49 +00:00
Diego Biurrun
0ffbc258aa
Change a bunch of codec long_names to be more consistent and descriptive.
...
Originally committed as revision 17716 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-02 05:18:33 +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
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
Mike Melanson
d61af67aa1
There is no reason to assign a variable to itself
...
Originally committed as revision 12405 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-10 03:07:15 +00:00
Michael Niedermayer
7993df6527
consts
...
I have underestimated this a little, and these are just some ...
Originally committed as revision 11708 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-01 03:26:31 +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
2029f312e8
Remove redundant #inclusion of common.h, avcodec.h already #includes it.
...
Originally committed as revision 8967 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-05-10 09:00:44 +00:00
Nicholas Tung
587d07227e
Remove superfluous setting of has_b_frames in codecs without B-frames.
...
patch by Nicholas Tung, ntung ntung com
Originally committed as revision 8647 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-04-07 17:37:30 +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
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
Måns Rullgård
4733abcbf3
use PRIxN, %zd, %td formats where needed
...
Originally committed as revision 4740 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-12-12 01:56:46 +00:00
Alex Beregszaszi
58aa2b1d35
10l
...
Originally committed as revision 3967 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-02-21 17:52:23 +00:00
Alex Beregszaszi
6ce1a818e1
unknown format chars
...
Originally committed as revision 2974 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-04-07 13:14:29 +00:00
Falk Hüffner
7906085fcc
warning patrol
...
Originally committed as revision 2925 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-03-24 23:32:48 +00:00
Mike Melanson
18a508c527
handle invalid buffer sizes
...
Originally committed as revision 2734 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-01-31 18:17:38 +00:00
Michel Bardiaux
9b87956678
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
...
Originally committed as revision 2469 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-11-03 13:26:22 +00:00
Mike Melanson
2a2bbcb05f
revised palette API, courtesy of Roberto Togni (rtogni at freemail.it)
...
Originally committed as revision 2451 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-10-30 05:40:58 +00:00
Dan Christiansen
dc7cb06ae0
gcc->C99 and warning fixes patch by (Dan Christiansen <danchr at daimi dot au dot dk>)
...
Originally committed as revision 2399 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-10-19 21:05:41 +00:00
Mike Melanson
bf649a9d6d
do away with all those naughty global variables
...
Originally committed as revision 2292 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-09-19 01:13:53 +00:00
Mike Melanson
d86e8568e6
video looks beautiful now, many thanks to Alexander Belyakov
...
<abel at krasu.ru> for squishing bunches of bugs
Originally committed as revision 2290 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-09-18 03:30:08 +00:00
Mike Melanson
7581685205
wrong, wrong, wrong...coded bits are read in the opposite direction
...
Originally committed as revision 2289 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-09-17 05:17:31 +00:00
Mike Melanson
186447f8fe
initial Interplay video decoder
...
Originally committed as revision 2275 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-09-14 19:39:18 +00:00
Mike Melanson
3ef8be2bfc
initial commit for Id RoQ and Interplay MVE multimedia subsystems
...
Originally committed as revision 2195 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-09-02 04:32:02 +00:00