Michael Niedermayer
e10979ff56
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
changelog: misc typo and wording fixes
H.264: add filter_mb_fast support for >8-bit decoding
doc: Remove outdated comments about gcc 2.95 and gcc 3.3 support.
lls: use av_lfg instead of rand() in test program
build: remove unnecessary dependency on libs from 'all' target
H.264: avoid redundant alpha/beta calculations in loopfilter
H.264: optimize intra/inter loopfilter decision
mpegts: fix Continuity Counter error detection
build: remove unnecessary FFLDFLAGS variable
vp8/mt: flush worker thread, not application thread context, on seek.
mt: proper locking around release_buffer calls.
DxVA2: unbreak build after [657ccb5ac7
]
hwaccel: unbreak build
Eliminate FF_COMMON_FRAME macro.
Conflicts:
Changelog
Makefile
doc/developer.texi
libavcodec/avcodec.h
libavcodec/h264.c
libavcodec/mpeg4videodec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-07-12 01:42:32 +02:00
Mans Rullgard
1765aacb17
hwaccel: unbreak build
...
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-07-10 23:58:26 +01: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
09ce846206
vaapi: filter out DELAYED_PIC_REF flag to determine field.
...
This fixes ticket #23 .
(cherry picked from commit 621f4c98df
)
Signed-off-by: Reinhard Tartler <siretart@tauware.de>
2011-04-09 12:00:57 +02:00
Gwenole Beauchesne
621f4c98df
vaapi: filter out DELAYED_PIC_REF flag to determine field.
...
This fixes ticket #23 .
2011-03-29 09:55:07 +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
Gwenole Beauchesne
b0941dee3c
[VA-API] Fix long-term reference frames addition to the DPB.
...
This fixes MR2_MW_A/MR2_TANDBERG_E on Intel Ironlake and NVIDIA HW.
Originally committed as revision 22869 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-04-13 06:43:01 +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
11ae0c52b9
Cope with rev 22183:
...
Reorder indexes in weight tables.
Originally committed as revision 22202 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-04 09:14:19 +00:00
Gwenole Beauchesne
48bf1325ac
Cope with rev 22169 change:
...
Merge weight & offset tables.
Originally committed as revision 22170 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-03 15:23:22 +00:00
Michael Niedermayer
0c32e19d58
Move +52 from the loop filter to the alpha/beta offsets in the context.
...
This should fix a segfault, also it might be faster on systems where the
+52 wasnt free.
Originally committed as revision 21406 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-23 18:05:30 +00:00
Laurent Aimar
75dd693840
Export get_slice_type() as ff_h264_get_slice_type().
...
Patch by Laurent Aimar <fenrir at videolan dot org>.
Originally committed as revision 21110 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-09 16:20:41 +00:00
Gwenole Beauchesne
07c9f6f673
Add H.264 bitstream decoding through VAAPI.
...
Originally committed as revision 20957 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-12-29 08:48:18 +00:00