summaryrefslogtreecommitdiff
path: root/libavcodec/dxtory.c
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit 'cc8163e1a3601a56f722a4720516e860bf1c6198'Michael Niedermayer2014-03-221-16/+19
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'cc8163e1a3601a56f722a4720516e860bf1c6198': avcodec: more correct printf specifiers Conflicts: libavcodec/4xm.c libavcodec/alsdec.c libavcodec/dfa.c libavcodec/h264_ps.c libavcodec/jpeg2000dec.c libavcodec/lagarith.c libavcodec/mpeg12dec.c libavcodec/rv10.c libavcodec/svq3.c libavcodec/wmaprodec.c libavcodec/xwddec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avcodec: more correct printf specifiersDiego Biurrun2014-03-221-16/+19
| |
* | avcodec/dxtory: fix src size checksMichael Niedermayer2014-02-161-4/+4
| | | | | | | | | | | | | | | | Fixes integer overflow Fixes out of array read Fixes: d104661bb59b202df7671fb19a00ca6c-asan_heap-oob_d6429d_5066_cov_1729501105_dxtory_mic.avi Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2014-01-251-0/+113
|\ \ | |/ | | | | | | | | | | | | | | | | * qatar/master: dxtory: compressed RGB555/RGB565 decoding support Conflicts: libavcodec/dxtory.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * dxtory: compressed RGB555/RGB565 decoding supportKostya Shishkov2014-01-241-0/+113
| |
* | Merge commit '0e1ad2f591b87e944550c15b54e54f8189743289'Michael Niedermayer2014-01-251-11/+418
|\ \ | |/ | | | | | | | | | | | | | | | | * commit '0e1ad2f591b87e944550c15b54e54f8189743289': dxtory: add more compressed and uncompressed modes Conflicts: libavcodec/dxtory.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * dxtory: add more compressed and uncompressed modesKostya Shishkov2014-01-241-11/+418
| |
* | Merge commit '025fd76e1a2623c858d8c686a73cc30980a314b0'Michael Niedermayer2014-01-211-1/+1
|\ \ | |/ | | | | | | | | | | * commit '025fd76e1a2623c858d8c686a73cc30980a314b0': dxtory: change error code for unexpected slice configuration Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * dxtory: change error code for unexpected slice configurationKostya Shishkov2014-01-211-1/+1
| |
* | Merge commit 'e91a3f1bdba9b4945e42c191d2e35e9844625fb4'Michael Niedermayer2014-01-211-6/+12
|\ \ | |/ | | | | | | | | | | * commit 'e91a3f1bdba9b4945e42c191d2e35e9844625fb4': dxtory: correctly handle YUV slices with average odd height Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * dxtory: correctly handle YUV slices with average odd heightKostya Shishkov2014-01-211-6/+12
| |
* | Reinstate proper FFmpeg license for all files.Thilo Borgmann2013-08-301-4/+4
| |
* | avcodec/dxtory: make def_lru[8] staticMichael Niedermayer2013-08-021-1/+1
|/ | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* dxtory v2 supportKostya Shishkov2013-05-281-22/+156
|
* avcodec: av_log_ask_for_sample() ---> avpriv_request_sample()Diego Biurrun2013-03-131-1/+1
|
* lavc decoders: work with refcounted frames.Anton Khirnov2013-03-081-21/+2
|
* lavc: fix decode_frame() third parameter semantics for video decodersAnton Khirnov2012-12-041-2/+2
| | | | It's got_frame, not data size
* lavc: add a wrapper for AVCodecContext.get_buffer().Anton Khirnov2012-12-041-1/+2
| | | | It will be useful in the upcoming transition to refcounted AVFrames.
* dxtory: Replace AV_WN16A(AV_RN16A()) combination by AV_COPY16Diego Biurrun2012-10-231-2/+2
|
* Replace PIX_FMT_* -> AV_PIX_FMT_*, PixelFormat -> AVPixelFormatAnton Khirnov2012-10-081-1/+1
|
* Don't include common.h from avutil.hMartin Storsjö2012-08-151-0/+1
| | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* Replace all CODEC_ID_* with AV_CODEC_ID_*Anton Khirnov2012-08-071-1/+1
|
* Dxtory capture format decoderKostya Shishkov2011-12-101-0/+109
Signed-off-by: Anton Khirnov <anton@khirnov.net>