Michael Niedermayer
4dcd1a3145
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
adtsenc: Check frame size.
txd: Fix order of operations.
APIchanges: fill in some blanks
timer: fix misspelling of "decicycles"
Eliminate pointless 0/NULL initializers in AVCodec and similar declarations.
indeo3: cosmetics
md5proto: Fix order of operations.
dca: Replace oversized unused get_bits() with skip_bits_long().
Conflicts:
doc/APIchanges
libavformat/mmsh.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-29 00:20:29 +01:00
Diego Biurrun
c88ebdb42c
Eliminate pointless 0/NULL initializers in AVCodec and similar declarations.
2011-11-28 10:01:50 +01:00
Gwenole Beauchesne
53efb758c0
vaapi: Fix VC-1 decoding (reconstruct bitstream TTFRM correctly).
...
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2011-10-10 14:11:02 +02:00
Gwenole Beauchesne
825dd135d8
vaapi: fix VC-1 decoding (reconstruct bitstream TTFRM correctly).
2011-10-06 15:35:48 +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
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
Gwenole Beauchesne
da21440d46
vaapi: cope with VA-API 0.32, i.e. fix VC-1 decoding on Sandy Bridge.
...
(cherry picked from commit a18e7b4fb7
)
Signed-off-by: Reinhard Tartler <siretart@tauware.de>
2011-04-09 12:02:04 +02:00
Gwenole Beauchesne
da3716021b
vaapi: allow build against older VA-API 0.31.
2011-03-30 16:15:29 +02:00
Gwenole Beauchesne
a18e7b4fb7
vaapi: cope with VA-API 0.32, i.e. fix VC-1 decoding on Sandy Bridge.
2011-03-29 09:39:30 +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
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
Luca Barbato
1d20121b2e
Add ff_ to AVHWAccel decoders
...
That unbreaks compilation of vaapi and dxva2
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
(cherry picked from commit d1b6f33bf2
)
2011-01-28 03:15:35 +01:00
Luca Barbato
d1b6f33bf2
Add ff_ to AVHWAccel decoders
...
That unbreaks compilation of vaapi and dxva2
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
2011-01-27 10:03:14 +01: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
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
Gwenole Beauchesne
81774dd0c4
VAAPI: fix WMV3 decoding of videos with an odd number of macroblocks per line.
...
Originally committed as revision 21012 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-04 09:23:24 +00:00
Gwenole Beauchesne
e6d3534f9c
Use VA_INVALID_ID instead of hard coded values.
...
Originally committed as revision 20948 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-12-28 15:19:36 +00:00
Gwenole Beauchesne
8b0867121e
Rename ff_vaapi_alloc_picture() to ff_vaapi_alloc_pic_param().
...
Originally committed as revision 20942 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-12-28 09:03:09 +00:00
Gwenole Beauchesne
36ad2b3ee0
Rename ff_vaapi_get_surface() to ff_vaapi_get_surface_id().
...
Originally committed as revision 20941 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-12-28 09:02:16 +00:00
Diego Biurrun
fe3608d577
Do not check for CONFIG_VC1_VAAPI_HWACCEL, the file is only
...
compiled if that condition is true.
Originally committed as revision 19531 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-07-29 09:51:51 +00:00
Gwenole Beauchesne
68367bdef0
Add VC-1 bitstream decoding through VA API.
...
Originally committed as revision 18324 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-03 07:40:58 +00:00