summaryrefslogtreecommitdiff
path: root/libavcodec/hqx.c
Commit message (Collapse)AuthorAge
* hqx: correct type and size check of info_offsetAndreas Cadhalpun2015-11-20
| | | | | | | | | | It is used as size argument of ff_canopus_parse_info_tag, which uses it as size argument to bytestream2_init, which only supports sizes up to INT_MAX. Changing it's type to unsigned simplifies the check. Reviewed-by: Vittorio Giovara <vittorio.giovara@gmail.com> Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
* Merge commit 'def97856de6021965db86c25a732d78689bd6bb0'Michael Niedermayer2015-07-27
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-27
| | | | | | | | | | | | Express bitfields more simply. Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
* | Merge commit 'bb428e00ac158244d6691bf135be404e85b66a8b'Michael Niedermayer2015-04-24
|\| | | | | | | | | | | | | * commit 'bb428e00ac158244d6691bf135be404e85b66a8b': hqx: Mark codec as init-thread-safe and init-cleanup Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * hqx: Mark codec as init-thread-safe and init-cleanupVittorio Giovara2015-04-24
| |
* | Merge commit 'e6fb844f7b736e72da364032d251283bce9e63ad'Michael Niedermayer2015-04-20
|\| | | | | | | | | | | | | * commit 'e6fb844f7b736e72da364032d251283bce9e63ad': Implement shared parsing of INFO tag in Canopus family Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Implement shared parsing of INFO tag in Canopus familyVittorio Giovara2015-04-19
| | | | | | | | | | Add some bounds checking to CLLC; reduce HQX variable scoping, add an error message.
* | Merge commit '5b5338f6d1272526d2634501555cbaff4cdfb87b'Michael Niedermayer2015-04-20
|\| | | | | | | | | | | | | | | | | | | | | | | * commit '5b5338f6d1272526d2634501555cbaff4cdfb87b': hqx: Implement slice-threaded decoding Conflicts: libavcodec/hqx.c libavcodec/hqx.h See: eff72a6c7375587a3280ddf59e6e26a4907823b7 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * hqx: Implement slice-threaded decodingVittorio Giovara2015-04-19
| | | | | | | | | | | | Inspired by a patch from Ferdinand Oeinck <ferdo@demon.nl>. Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
* | Merge commit '453642f8afe9f979fcc813a246b1ec656ec36a93'Michael Niedermayer2015-04-20
|\| | | | | | | | | | | | | | | | | | | | | * commit '453642f8afe9f979fcc813a246b1ec656ec36a93': hqx: Store shareable data in main decoder context Conflicts: libavcodec/hqx.c libavcodec/hqx.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * hqx: Store shareable data in main decoder contextVittorio Giovara2015-04-19
| | | | | | | | In preparation for multithreaded decoding.
* | Merge commit 'ea031b75fb50c59196ccb654c9d143fb75365da9'Michael Niedermayer2015-04-20
|\| | | | | | | | | | | | | | | | | | | * commit 'ea031b75fb50c59196ccb654c9d143fb75365da9': hqx: Move DSP related code to a separate file Conflicts: libavcodec/hqx.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * hqx: Move DSP related code to a separate fileVittorio Giovara2015-04-19
| |
* | Merge commit '17aa81d94781c6f62dc7d1dbd1f8891c020c9905'Michael Niedermayer2015-04-20
|\| | | | | | | | | | | | | | | | | | | * commit '17aa81d94781c6f62dc7d1dbd1f8891c020c9905': hqx: Merge invalid format check within switch block Conflicts: libavcodec/hqx.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * hqx: Merge invalid format check within switch blockVittorio Giovara2015-04-19
| |
| * hqx: Fix clipping error in idct put functionFerdinand Oeinck2015-04-09
| | | | | | | | Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
* | avcodec/hqx: Use av_clip_uintp2()Michael Niedermayer2015-04-10
| | | | | | | | | | Suggested-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | libavcodec/hqx: multi threading supportFerdinand Oeinck2015-04-10
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | libavcodec/hqx: correct clipping errorferdo@bigroses.nl2015-04-08
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/hqx: use init_get_bits8()Paul B Mahol2015-02-27
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | avcodec/hqx: fix typoPaul B Mahol2015-02-27
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | avcodec/hqx: remove superfluous log messagePaul B Mahol2015-02-23
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | Merge commit '35c6ce76b107225a19eb33aea38857d2405882af'Michael Niedermayer2015-02-23
|/ | | | | | | | | | | | | * commit '35c6ce76b107225a19eb33aea38857d2405882af': Canopus HQX decoder Conflicts: Changelog libavcodec/avcodec.h libavcodec/version.h tests/fate/video.mak Merged-by: Michael Niedermayer <michaelni@gmx.at>
* Canopus HQX decoderVittorio Giovara2015-02-22
Based on work by Kostya Shishkov <kostya.shishkov@gmail.com>.