summaryrefslogtreecommitdiffstats
path: root/libavcodec/dxtory.c
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit 'b668662939de3a02454cfc9ba3e6d10b87527a40'Clément Bœsch2016-06-291-2/+3
|\ | | | | | | | | | | | | | | | | | | * commit 'b668662939de3a02454cfc9ba3e6d10b87527a40': get_bits: Move BITSTREAM_READER_LE definition before all relevant #includes The merge commit also includes changes for libavcodec/interplayacm.c and libavcodec/truemotion2rt.c Merged-by: Clément Bœsch <clement@stupeflix.com>
| * get_bits: Move BITSTREAM_READER_LE definition before all relevant #includesDiego Biurrun2016-06-071-2/+3
| | | | | | | | | | | | | | This avoids the danger that get_bits.h might get indirectly #included before BITSTREAM_READER_LE is defined. Also sort headers into canonical order where appropriate.
| * Mark tables used only within their files as staticDiego Biurrun2016-03-301-3/+3
| |
* | avcodec/dxtory: Fix input size check in dxtory_decode_v1_410()Michael Niedermayer2015-11-151-1/+1
| | | | | | | | | | | | Fixes potential out of array read Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avcodec/dxtory: Fix input size check in dxtory_decode_v1_420()Michael Niedermayer2015-11-151-1/+1
| | | | | | | | | | | | | | | | Fixes out of array read Fixes: c50c4aa6cefda71b19a31ea12302980c/asan_heap-oob_12be5fd_7011_33ebd015a74976215934add72b9c8352.avi Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | Merge commit 'd0f7e4a57fbffa0efb204d4274c3dd56fbfff946'Hendrik Leppkes2015-09-081-239/+164
|\ \ | |/ | | | | | | | | | | * commit 'd0f7e4a57fbffa0efb204d4274c3dd56fbfff946': dxtory: Unify and rework the decoding routines Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * dxtory: Unify and rework the decoding routinesLuca Barbato2015-09-061-239/+165
| | | | | | | | | | | | | | Do not make many assumption on the dimension of the slices and just try to decode additional lines if there is enough data left. Decodes all the samples kindly provided by ultramage.
* | Merge commit 'a7e6fbd90e62d3320b1e26d8209fc0f55ee5b0be'Hendrik Leppkes2015-09-081-65/+37
|\ \ | |/ | | | | | | | | | | * commit 'a7e6fbd90e62d3320b1e26d8209fc0f55ee5b0be': dxtory: Factorize the buffer loading Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * dxtory: Factorize the buffer loadingLuca Barbato2015-09-041-65/+37
| | | | | | | | And the checks nearby it.
* | Merge commit '6a6bc43f5f79587b8936334cc0b3a6616f4807ac'Hendrik Leppkes2015-09-081-76/+49
|\ \ | |/ | | | | | | | | | | * commit '6a6bc43f5f79587b8936334cc0b3a6616f4807ac': dxtory: Factorize slice size checks Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * dxtory: Factorize slice size checksLuca Barbato2015-09-041-76/+48
| | | | | | | | They are always the same.
* | Merge commit 'def97856de6021965db86c25a732d78689bd6bb0'Michael Niedermayer2015-07-271-1/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'def97856de6021965db86c25a732d78689bd6bb0': lavc: AV-prefix all codec capabilities Conflicts: cmdutils.c ffmpeg.c ffplay.c libavcodec/8svx.c libavcodec/aacenc.c libavcodec/ac3dec.c libavcodec/adpcm.c libavcodec/alac.c libavcodec/atrac3plusdec.c libavcodec/bink.c libavcodec/dnxhddec.c libavcodec/dvdec.c libavcodec/dvenc.c libavcodec/ffv1dec.c libavcodec/ffv1enc.c libavcodec/fic.c libavcodec/flacdec.c libavcodec/flacenc.c libavcodec/flvdec.c libavcodec/fraps.c libavcodec/frwu.c libavcodec/gifdec.c libavcodec/h261dec.c libavcodec/hevc.c libavcodec/iff.c libavcodec/imc.c libavcodec/libopenjpegdec.c libavcodec/libvo-aacenc.c libavcodec/libvorbisenc.c libavcodec/libvpxdec.c libavcodec/libvpxenc.c libavcodec/libx264.c libavcodec/mjpegbdec.c libavcodec/mjpegdec.c libavcodec/mpegaudiodec_float.c libavcodec/msmpeg4dec.c libavcodec/mxpegdec.c libavcodec/nvenc_h264.c libavcodec/nvenc_hevc.c libavcodec/pngdec.c libavcodec/qpeg.c libavcodec/ra288.c libavcodec/rv10.c libavcodec/s302m.c libavcodec/sp5xdec.c libavcodec/takdec.c libavcodec/tiff.c libavcodec/tta.c libavcodec/utils.c libavcodec/v210dec.c libavcodec/vp6.c libavcodec/vp9.c libavcodec/wavpack.c libavcodec/yop.c Merged-by: Michael Niedermayer <michael@niedermayer.cc>
| * lavc: AV-prefix all codec capabilitiesVittorio Giovara2015-07-271-1/+1
| | | | | | | | | | | | Express bitfields more simply. Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
* | avcodec/dxtory: use init_get_bits8()Paul B Mahol2015-02-141-5/+10
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | avcodec/dxtory: Use LL instead of L number suffixMichael Niedermayer2015-02-011-3/+3
| | | | | | | | | | | | | | This is probably unneeded and normal int would be fine, but its safer to use LL and this isnt speed relevant Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/dxtory: use unaligned copy for unaligned addressesMichael Niedermayer2014-10-301-4/+4
| | | | | | | | | | | | | | Fixes undefined behavior Fixes: asan_heap-oob_112c6b3_13_012.avi Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/dxtory: remove unused variablesMichael Niedermayer2014-09-261-4/+2
| | | | | | | | | | Found-by: Benoit Fouet <benoit.fouet@free.fr> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/dxtory: Support dxtory-2.0.127.aviMichael Niedermayer2014-09-251-6/+4
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | 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>
OpenPOWER on IntegriCloud