summaryrefslogtreecommitdiffstats
path: root/libavcodec/s3tc.c
Commit message (Collapse)AuthorAgeFilesLines
* avcodec/s3tc: fix alpha decoding when dimensions are not a multiple of 4Tom Butterworth2015-05-071-1/+3
| | | | | | Fix alpha position error for edge blocks of odd-dimensioned frames Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avcodec/s3tc: fix decoding when dimensions are not a multiple of 4Tom Butterworth2015-05-071-10/+13
| | | | | | Image dimensions were rounded down causing rows to wrap early if dimensions were not a multiple of 4. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-09-111-1/+1
|\ | | | | | | | | | | | | * qatar/master: Drop pointless directory name prefixes from #includes in the current dir Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Drop pointless directory name prefixes from #includes in the current dirDiego Biurrun2013-09-101-1/+1
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-03-131-11/+11
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: pcm-mpeg: convert to bytestream2 API Revert "h264: clear trailing bits in partially parsed NAL units" remove iwmmxt optimizations mimic: do not continue if swap_buf_size is 0 mimic: convert to bytestream2 API frwu: use MKTAG to check marker instead of AV_RL32 txd: port to bytestream2 API c93: convert to bytestream2 API iff: make .long_name more descriptive FATE: add test for cdxl demuxer rtsp: Fix a typo Conflicts: libavcodec/arm/dsputil_iwmmxt.c libavcodec/arm/dsputil_iwmmxt_rnd_template.c libavcodec/arm/mpegvideo_iwmmxt.c libavcodec/c93.c libavcodec/txd.c libavutil/arm/cpu.c tests/fate/demux.mak Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * txd: port to bytestream2 APIPaul B Mahol2012-03-121-11/+11
| | | | | | | | | | | | | | Protects against overreads. Signed-off-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-11-271-1/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (42 commits) swscale: fix signed overflow in yuv2mono_X_c_template snow: fix integer overflows svq1enc: remove stale altivec-related hack snow: fix signed overflow in byte to 32-bit replication adx: rename ff_adx_decode_header() to avpriv_adx_decode_header() avformat: add CRI ADX format demuxer adx: add an ADX parser. adx: move header decoding to ADX common code adx: calculate the number of blocks in a packet adx: define and use 2 new macro constants BLOCK_SIZE and BLOCK_SAMPLES adx: check for unsupported ADX formats adx: simplify encoding by using put_sbits() adx: calculate correct LPC coeffs adx: use 12-bit coefficients instead of 14-bit to avoid integer overflow adx: simplify adx_decode() by using get_sbits() to read residual samples adx: fix the data offset parsing in adx_decode_header() adx: remove unneeded post-decode channel interleaving adx: validate header values adx: cosmetics: general pretty-printing and comment clean-up adx: remove useless comments ... Conflicts: Changelog libavcodec/cook.c libavcodec/fraps.c libavcodec/nuv.c libavcodec/pthread.c libavcodec/version.h libavformat/Makefile libavformat/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * s3tc: fix shift overflow by using unsigned constantMans Rullgard2011-11-261-1/+1
| | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
| * Replace FFmpeg with Libav in licence headersMans Rullgard2011-03-191-4/+4
|/ | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
* Fix build: Add intreadwrite.h and bswap.h #includes where necessary.Diego Biurrun2009-01-111-0/+1
| | | | Originally committed as revision 16556 to svn://svn.ffmpeg.org/ffmpeg/trunk
* use AV_RL* instead of le2me_*Aurelien Jacobs2008-02-011-3/+3
| | | | Originally committed as revision 11802 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Group all copyright and author notices together.Diego Biurrun2007-07-051-2/+2
| | | | Originally committed as revision 9483 to svn://svn.ffmpeg.org/ffmpeg/trunk
* generic S3TC DXT1 and DXT3 decoding functionsIvo van Poorten2007-05-071-0/+96
Originally committed as revision 8925 to svn://svn.ffmpeg.org/ffmpeg/trunk
OpenPOWER on IntegriCloud