summaryrefslogtreecommitdiff
path: root/libavcodec
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit '059866eb17cd3c66422a61d3e9c3305f55830a50'Michael Niedermayer2013-02-092-14/+14
|\ | | | | | | | | | | | | * commit '059866eb17cd3c66422a61d3e9c3305f55830a50': dsputil: Move WRAPPER8_16_SQ macro to the only place it is used Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * dsputil: Move WRAPPER8_16_SQ macro to the only place it is usedDiego Biurrun2013-02-082-14/+14
| |
* | rnd_avg: fix author attributionMichael Niedermayer2013-02-091-4/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reference: commit 41fda91d097b85542981a4779e36f8eefda7ee69 Author: BERO <bero@geocities.co.jp> Date: Wed May 14 17:46:55 2003 +0000 aligned dsputil (for sh4) patch by (BERO <bero at geocities dot co dot jp>) Originally committed as revision 1880 to svn://svn.ffmpeg.org/ffmpeg/trunk commit 8dbe5856410ee10ac4a9368105149efdacfac994 Author: Oskar Arvidsson <oskar@irock.se> Date: Tue Mar 29 17:48:59 2011 +0200 Adds 8-, 9- and 10-bit versions of some of the functions used by the h264 decoder. This patch lets e.g. dsputil_init chose dsp functions with respect to the bit depth to decode. The naming scheme of bit depth dependent functions is <base name>_<bit depth>[_<prefix>] (i.e. the old clear_blocks_c is now named clear_blocks_8_c). Note: Some of the functions for high bit depth is not dependent on the bit depth, but only on the pixel size. This leaves some room for optimizing binary size. Preparatory patch for high bit depth h264 decoding support. Signed-off-by: Michael Niedermayer <michaelni@gmx.at> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'bf6b3ec924b4fb64d14df33077f4d4541d525dbf'Michael Niedermayer2013-02-097-23/+52
|\ \ | |/ | | | | | | | | | | * commit 'bf6b3ec924b4fb64d14df33077f4d4541d525dbf': dsputil: Move rnd_avg inline functions to a separate header Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * dsputil: Move rnd_avg inline functions to a separate headerDiego Biurrun2013-02-086-23/+51
| |
* | Merge commit 'b9c2408b19dc9408e9dc0ce4a099af529bbfba3b'Michael Niedermayer2013-02-091-8/+0
|\ \ | |/ | | | | | | | | | | * commit 'b9c2408b19dc9408e9dc0ce4a099af529bbfba3b': dsputil: Remove commented-out, unused function declarations Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * dsputil: Remove commented-out, unused function declarationsDiego Biurrun2013-02-081-8/+0
| |
* | Merge commit '35685a3c2a1ec09f3c62dcfc4368fe9e92bcddf6'Michael Niedermayer2013-02-097-8/+60
|\ \ | |/ | | | | | | | | | | | | * commit '35685a3c2a1ec09f3c62dcfc4368fe9e92bcddf6': dsputil: Move ff_shrink* function declarations to separate header dsputil: Move ff_svq3 function declarations to a separate header Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * dsputil: Move ff_shrink* function declarations to separate headerDiego Biurrun2013-02-074-5/+31
| |
| * dsputil: Move ff_svq3 function declarations to a separate headerDiego Biurrun2013-02-074-3/+29
| |
* | Merge commit '6a4430407404bfe55581e66a86a496c9adf6fb44'Michael Niedermayer2013-02-094-20/+47
|\ \ | |/ | | | | | | | | | | | | | | | | * commit '6a4430407404bfe55581e66a86a496c9adf6fb44': dsputil: Move ff_h264_idct function declarations to a separate header Conflicts: libavcodec/dsputil.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * dsputil: Move ff_h264_idct function declarations to a separate headerDiego Biurrun2013-02-074-18/+45
| |
* | Merge commit 'b9ba5253dd1232be4b48cfe61c31ff4b3de3d10a'Michael Niedermayer2013-02-098-69/+100
|\ \ | |/ | | | | | | | | | | | | | | | | * commit 'b9ba5253dd1232be4b48cfe61c31ff4b3de3d10a': dsputil: Move copy_block functions to a separate header dsputil: Drop unused functions copy_block{2|4|16} No functions are droped because they are used in several places. Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * dsputil: Move copy_block functions to a separate headerDiego Biurrun2013-02-074-36/+63
| |
| * dsputil: Drop unused functions copy_block{2|4|16}Diego Biurrun2013-02-071-33/+0
| |
* | Merge commit 'b9ee5f2cab3ffe1c962e542346b1ed61394864ec'Michael Niedermayer2013-02-092-9/+14
|\ \ | |/ | | | | | | | | | | | | | | | | | | * commit 'b9ee5f2cab3ffe1c962e542346b1ed61394864ec': indeo3: replace use of copy_block4 with put_pixels mjpegdec: use put_pixels instead of copy_block8 Conflicts: libavcodec/mjpegdec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * indeo3: replace use of copy_block4 with put_pixelsMans Rullgard2013-02-071-9/+12
| | | | | | | | | | | | The destination is sufficiently aligned for put_pixels here. Signed-off-by: Mans Rullgard <mans@mansr.com>
| * mjpegdec: use put_pixels instead of copy_block8Mans Rullgard2013-02-071-4/+6
| | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
* | Merge commit 'b5b7b75e91e291c810ebd01868a42b53f267a87c'Michael Niedermayer2013-02-093-24/+48
|\ \ | |/ | | | | | | | | | | | | | | | | * commit 'b5b7b75e91e291c810ebd01868a42b53f267a87c': dsputil: Move get_penalty_factor() to the only place it is used. Conflicts: libavcodec/dsputil.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * dsputil: Move get_penalty_factor() to the only place it is used.Diego Biurrun2013-02-072-20/+20
| |
* | Merge commit '0b016eb99d38738e2c53e36549a4732a0f863b2e'Michael Niedermayer2013-02-094-35/+35
|\ \ | |/ | | | | | | | | | | * commit '0b016eb99d38738e2c53e36549a4732a0f863b2e': dsputil: Move ff_block_permute to mpegvideo_enc Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * dsputil: Move ff_block_permute to mpegvideo_encDiego Biurrun2013-02-074-35/+35
| |
* | sparc: Revert some parameter name changes in dsputil_vis.cJames Almer2013-02-091-28/+28
| | | | | | | | | | | | | | | | They were renamed by mistake in 25841df. This should fix compilation failures on sparc. Signed-off-by: James Almer <jamrial@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | get_se_golomb: fix decoding of very large valuesMichael Niedermayer2013-02-091-1/+5
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | dsp: make put_no_rnd_pixels_tab 4x4 bigMichael Niedermayer2013-02-081-1/+1
| | | | | | | | | | | | | | | | This makes it match the other tables and fixes out of array acceses. Fixes CID980012 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | dxva2: Prevent redefinition of _WIN32_WINNTJames Almer2013-02-081-0/+7
| | | | | | | | | | | | | | Don't redefine _WIN32_WINNT when targeting Win7/8 Signed-off-by: James Almer <jamrial@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | vc1dec: Fix destination pointers in context for fieldsMichael Niedermayer2013-02-081-27/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This replaces a large number of checks for the second field by fixing the pointers when they are setup This should also fix I/BI field pictures Changes checksums for vc1_sa10143, the file becomes slightly closer to what the reference decoder outputs Based on "vc1dec: the second field is written wrong to the picture" by Sebastian Sandberg <sebastiand.sandberg@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | x86/dsputil: Fix author attribution after code has been moved/splited aroundMichael Niedermayer2013-02-071-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reference: commit 3615e2be846f6382aa42360d02d16b25f443af9f Author: Michael Niedermayer <michaelni@gmx.at> Date: Tue Dec 2 22:02:57 2003 +0000 h263_h_loop_filter_mmx Originally committed as revision 2553 to svn://svn.ffmpeg.org/ffmpeg/trunk commit 359f98ded95ec65f7109b25f3cfaa9189c4fab9c Author: Michael Niedermayer <michaelni@gmx.at> Date: Tue Dec 2 20:28:10 2003 +0000 h263_v_loop_filter_mmx Originally committed as revision 2552 to svn://svn.ffmpeg.org/ffmpeg/trunk Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-02-072-177/+171
|\ \ | |/ | | | | | | | | | | | | * qatar/master: dsputil: x86: Fix compile error dsputil: x86: Convert h263 loop filter to yasm Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * dsputil: x86: Fix compile errorDaniel Kang2013-02-071-2/+2
| | | | | | | | | | | | Accidentally prefixed ff_ with cextern. Signed-off-by: Martin Storsjö <martin@martin.st>
| * dsputil: x86: Convert h263 loop filter to yasmDaniel Kang2013-02-062-177/+171
| | | | | | | | Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | Merge commit '12b54a1f39fee22fa0399825ae47a43e60bad4c5'Michael Niedermayer2013-02-071-5/+5
|\ \ | |/ | | | | | | | | | | * commit '12b54a1f39fee22fa0399825ae47a43e60bad4c5': mpegvideo: remove an unused function parameter Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mpegvideo: remove an unused function parameterAnton Khirnov2013-02-061-5/+5
| |
* | Merge commit '605b047bcc48482dc8a356f56629da259fbddbf1'Michael Niedermayer2013-02-071-2/+6
|\ \ | |/ | | | | | | | | | | * commit '605b047bcc48482dc8a356f56629da259fbddbf1': rv10: improve buffer size check. Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rv10: improve buffer size check.Anton Khirnov2013-02-061-2/+6
| | | | | | | | | | Check slice count and input buffer size before constructing a possibly invalid pointer, not after.
* | error_resilience: assert that unsupported B frame interpolation isnt used ↵Michael Niedermayer2013-02-071-0/+1
| | | | | | | | | | | | with h264 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'c5fcdb440237f06f6c954185ab60970cabf786a2'Michael Niedermayer2013-02-072-8/+1
|\ \ | |/ | | | | | | | | | | | | * commit 'c5fcdb440237f06f6c954185ab60970cabf786a2': error_resilience: remove a useless if() and FIXME h264: remove silly macros Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * error_resilience: remove a useless if() and FIXMEAnton Khirnov2013-02-061-5/+1
| | | | | | | | pp_time is never set for h264
| * h264: remove silly macrosAnton Khirnov2013-02-061-3/+0
| | | | | | | | | | They serve no useful purpose and wreak all kind of havoc when h264.h is included elsewhere.
* | Merge commit 'ca1fe6c0e60808da45d4dfd8728f45e843b9f9b0'Michael Niedermayer2013-02-075-5/+5
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | * commit 'ca1fe6c0e60808da45d4dfd8728f45e843b9f9b0': h263: remove an unused parameter from ff_h263_decode_init_vlc flac: add channel layout masks for streams with 7 or 8 channels. flac: don't check the number of channels before setting the channel layout. Conflicts: libavcodec/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * h263: remove an unused parameter from ff_h263_decode_init_vlcAnton Khirnov2013-02-064-4/+4
| |
| * flac: add channel layout masks for streams with 7 or 8 channels.Tim Walker2013-02-062-3/+5
| | | | | | | | | | | | | | They were added to the latest FLAC specification: https://git.xiph.org/?p=flac-website.git;a=commit;h=65c199a2 Signed-off-by: Anton Khirnov <anton@khirnov.net>
| * flac: don't check the number of channels before setting the channel layout.Tim Walker2013-02-062-2/+2
| | | | | | | | | | | | This is unnecessary, as ff_flac_set_channel_layout can handle any number of channels. Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Merge commit 'a846dccb29d2bb0798af1d47d06100eda9ca87cc'Michael Niedermayer2013-02-0711-26/+30
|\ \ | |/ | | | | | | | | | | | | | | | | | | * commit 'a846dccb29d2bb0798af1d47d06100eda9ca87cc': h264chroma: x86: Fix building with yasm disabled rv34: Drop now unnecessary dsputil dependencies Conflicts: libavcodec/x86/Makefile Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * h264chroma: x86: Fix building with yasm disabledMartin Storsjö2013-02-062-2/+4
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
| * rv34: Drop now unnecessary dsputil dependenciesDiego Biurrun2013-02-069-24/+26
| |
* | Merge commit '79dad2a932534d1155079f937649e099f9e5cc27'Michael Niedermayer2013-02-0741-683/+981
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | * commit '79dad2a932534d1155079f937649e099f9e5cc27': dsputil: Separate h264chroma Conflicts: libavcodec/dsputil_template.c libavcodec/ppc/dsputil_ppc.c libavcodec/vc1dec.c libavcodec/vc1dsp.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * dsputil: Separate h264chromaDiego Biurrun2013-02-0639-679/+970
| |
* | flac: don't check the number of channels before setting the channel layoutTim Walker2013-02-072-2/+2
| | | | | | | | This is unnecessary, as ff_flac_set_channel_layout can handle any number of channels.
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-02-061-0/+12
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: mpegvideo: initialize dummy reference frames. Conflicts: libavcodec/mpegvideo.c tests/ref/fate/filter-yadif-mode1 The luma init is left at 0x80 as it was previously, and tested and working since a long time. Its also mandated to be 0x80 by at least one specification. Cases that need different values already had code in place to handle them. Merged-by: Michael Niedermayer <michaelni@gmx.at>
View Lorry Controller Status