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
Michael Niedermayer
5271b857eb
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
dnxhddec: avoid a branch in 10-bit decode_dct_block()
H.264: Add optimizations to predict x86 assembly.
riff: Add mpgv MPEG-2 fourcc
add Flash Screen Video 2 decoder
Conflicts:
configure
doc/general.texi
libavcodec/Makefile
libavcodec/allcodecs.c
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-07-23 16:47:10 +02:00
Mans Rullgard
b4cfb8254e
dnxhddec: avoid a branch in 10-bit decode_dct_block()
...
The minimum weight value is 32 so this test can be skipped for the
10-bit case. Overall speedup 3-4%.
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-07-22 23:39:31 +01:00
Michael Niedermayer
4095fa9038
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
dnxhddec: optimise dnxhd_decode_dct_block()
rtp: remove disabled code
eac3enc: use different numbers of blocks per frame to allow higher bitrates
dnxhd: add regression test for 10-bit
dnxhd: 10-bit support
dsputil: update per-arch init funcs for non-h264 high bit depth
dsputil: template get_pixels() for different bit depths
dsputil: create 16/32-bit dctcoef versions of some functions
jfdctint: add 10-bit version
mov: add clcp type track as Subtitle stream.
mpeg4: add Mpeg4 Profiles names.
mpeg4: decode Level Profile for MPEG4 Part 2.
ffprobe: display bitstream level.
imgconvert: remove unused glue and xglue macros
Conflicts:
libavcodec/dsputil_template.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-07-22 12:08:52 +02:00
Mans Rullgard
bb32fded36
dnxhddec: optimise dnxhd_decode_dct_block()
...
Template the function for 8/10-bit and use lowlevel bitstream
macros.
6% faster overall on i7 gcc 4.5.
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-07-21 23:14:37 +01:00
Joseph Artsimovich
5ab21439fd
dnxhd: 10-bit support
...
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-07-21 18:44:40 +01:00
Baptiste Coudurier
721719dd0c
dnxhddec: handle cid change in bitstream.
2011-06-26 14:09:48 -07:00
Stefano Sabatini
01042d4123
lavc: set defaults in internal codec frames
...
This is required specifically for setting frame->format to -1,
otherwise it will be set to 0 = PIX_FMT_YUV420P and code reading
the format from the output decoded frame will get misled.
In particular fix regressions occurring with the pending vsrc_buffer
patch.
2011-05-07 12:03:59 +02:00
Stefano Sabatini
ce5e49b0c2
replace deprecated FF_*_TYPE symbols with AV_PICTURE_TYPE_*
2011-05-02 16:41:41 +02:00
Stefano Sabatini
975a1447f7
Replace deprecated FF_*_TYPE symbols with AV_PICTURE_TYPE_*.
...
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2011-05-02 12:18:44 +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
Reinhard Tartler
7ffe76e540
Merge libavcore into libavutil
...
Done to keep ABI compatible. Otherwise this is just silly
2011-02-16 23:00:30 +01:00
Reinhard Tartler
737eb5976f
Merge libavcore into libavutil
...
It is pretty hopeless that other considerable projects will adopt
libavutil alone in other projects. Projects that need small footprint
are better off with more specialized libraries such as gnulib or rather
just copy the necessary parts that they need. With this in mind, nobody
is helped by having libavutil and libavcore split. In order to ease
maintenance inside and around FFmpeg and to reduce confusion where to
put common code, avcore's functionality is merged (back) to avutil.
Signed-off-by: Reinhard Tartler <siretart@tauware.de>
2011-02-15 16:18:21 +01:00
Luca Barbato
9ef5a9deaf
Replace dprintf with av_dlog
...
dprintf clashes with POSIX.1-2008
(cherry picked from commit dfd2a005eb
)
2011-01-30 03:41:48 +01:00
Luca Barbato
dfd2a005eb
Replace dprintf with av_dlog
...
dprintf clashes with POSIX.1-2008
2011-01-29 23:55:37 +01: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
Baptiste Coudurier
35ca5c0b6b
In dnxhd decoder, set key_frame on decoded frame
...
Originally committed as revision 26247 to svn://svn.ffmpeg.org/ffmpeg/trunk
2011-01-06 20:17:51 +00:00
Stefano Sabatini
e16f217ceb
Use new imgutils.h API names, fix deprecation warnings.
...
Originally committed as revision 25058 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-09-07 19:15:29 +00:00
Stefano Sabatini
6ce9b4310c
Remove use of the deprecated function avcodec_check_dimensions(), use
...
av_check_image_size() instead.
Originally committed as revision 24711 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-06 09:37:04 +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
Baptiste Coudurier
1307463d52
Fix interlaced vc-3 decoding, issue #1753
...
Originally committed as revision 22362 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-09 00:37:13 +00:00
Måns Rullgård
84dc2d8afa
Remove DECLARE_ALIGNED_{8,16} macros
...
These macros are redundant. All uses are replaced with the generic
DECLARE_ALIGNED macro instead.
Originally committed as revision 22233 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-06 14:24:59 +00:00
Måns Rullgård
c67278098d
Move array specifiers outside DECLARE_ALIGNED() invocations
...
Originally committed as revision 21377 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-22 03:25:11 +00:00
Måns Rullgård
20e7c8ae0a
Remove some unnecessary alignment specifiers
...
None of these arrays are used in ways requiring extra alignment.
Originally committed as revision 19715 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-08-26 12:12:40 +00:00
Stefano Sabatini
9106a698e7
Rename bitstream.h to get_bits.h.
...
Originally committed as revision 18494 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-13 16:20:26 +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
406792e7b0
cosmetics: Remove pointless period after copyright statement non-sentences.
...
Originally committed as revision 16684 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-19 15:46:40 +00:00
Baptiste Coudurier
af5e7fc9b9
use dsp clear_block
...
Originally committed as revision 16048 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-12-11 01:14:32 +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
Aurelien Jacobs
d37f007d54
remove #include "mpegvideo.h" where it is not needed
...
Originally committed as revision 12321 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-05 00:07:53 +00:00
Michael Niedermayer
bd0e945f8e
const
...
Originally committed as revision 11723 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-01 04:11:06 +00:00
Baptiste Coudurier
bb41f2e774
fix field order export
...
Originally committed as revision 11695 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-31 14:23:48 +00:00
Baptiste Coudurier
6cb1d36169
typo weigth->weight
...
Originally committed as revision 10687 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-10-08 12:28:36 +00:00
Baptiste Coudurier
cd52a9ca9f
preliminary 10 bit depth decoding support, still miss generic api to export picture, working on it
...
Originally committed as revision 10686 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-10-08 12:23:00 +00:00
Baptiste Coudurier
5e301bbb70
merge
...
Originally committed as revision 10685 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-10-08 12:14:43 +00:00
Baptiste Coudurier
a417d041f0
10l, check 'i' validity before using it
...
Originally committed as revision 10684 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-10-08 12:11:19 +00:00
Baptiste Coudurier
42d1ffa3a2
fix 10 bit per comp detection
...
Originally committed as revision 10683 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-10-08 12:08:42 +00:00
Baptiste Coudurier
d3dc629c62
move dnxhd data tables to separate file
...
Originally committed as revision 9906 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-08-04 13:41:33 +00:00
Baptiste Coudurier
0221ae8ca8
dnxhd 120 progressive support
...
Originally committed as revision 9903 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-08-04 13:26:29 +00:00
Baptiste Coudurier
3c605485bb
indentation
...
Originally committed as revision 9902 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-08-04 13:18:30 +00:00
Baptiste Coudurier
6b259e439c
dnxhd 185 interlaced support
...
Originally committed as revision 9901 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-08-04 13:17:53 +00:00
Baptiste Coudurier
dd661ebd36
cosmetic
...
Originally committed as revision 9900 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-08-04 13:10:16 +00:00
Baptiste Coudurier
9a0a2c9f12
no need to duplicate cid table vars in context
...
Originally committed as revision 9899 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-08-04 13:09:08 +00:00
Baptiste Coudurier
940e4bf9b9
10l, use correct cid table
...
Originally committed as revision 9898 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-08-04 13:03:12 +00:00
Baptiste Coudurier
035bc6470d
add coding unit size for interlaced decoding
...
Originally committed as revision 9897 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-08-04 12:59:49 +00:00
Baptiste Coudurier
36ebf91206
should be more correct
...
Originally committed as revision 9896 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-08-04 12:43:31 +00:00