Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mpc-hc/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2015-09-08Merge commit 'd0f7e4a57fbffa0efb204d4274c3dd56fbfff946'Hendrik Leppkes
* commit 'd0f7e4a57fbffa0efb204d4274c3dd56fbfff946': dxtory: Unify and rework the decoding routines Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2015-09-08Merge commit 'a7e6fbd90e62d3320b1e26d8209fc0f55ee5b0be'Hendrik Leppkes
* commit 'a7e6fbd90e62d3320b1e26d8209fc0f55ee5b0be': dxtory: Factorize the buffer loading Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2015-09-08Merge commit '6a6bc43f5f79587b8936334cc0b3a6616f4807ac'Hendrik Leppkes
* commit '6a6bc43f5f79587b8936334cc0b3a6616f4807ac': dxtory: Factorize slice size checks Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2015-09-06dxtory: Unify and rework the decoding routinesLuca Barbato
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.
2015-09-04dxtory: Factorize the buffer loadingLuca Barbato
And the checks nearby it.
2015-09-04dxtory: Factorize slice size checksLuca Barbato
They are always the same.
2015-07-27Merge commit 'def97856de6021965db86c25a732d78689bd6bb0'Michael Niedermayer
* 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>
2015-07-27lavc: AV-prefix all codec capabilitiesVittorio Giovara
Express bitfields more simply. Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
2015-02-14avcodec/dxtory: use init_get_bits8()Paul B Mahol
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2015-02-01avcodec/dxtory: Use LL instead of L number suffixMichael Niedermayer
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>
2014-10-30avcodec/dxtory: use unaligned copy for unaligned addressesMichael Niedermayer
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>
2014-09-26avcodec/dxtory: remove unused variablesMichael Niedermayer
Found-by: Benoit Fouet <benoit.fouet@free.fr> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-09-26avcodec/dxtory: Support dxtory-2.0.127.aviMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-22Merge commit 'cc8163e1a3601a56f722a4720516e860bf1c6198'Michael Niedermayer
* 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>
2014-03-22avcodec: more correct printf specifiersDiego Biurrun
2014-02-17avcodec/dxtory: fix src size checksMichael Niedermayer
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>
2014-01-25Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: dxtory: compressed RGB555/RGB565 decoding support Conflicts: libavcodec/dxtory.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-25Merge commit '0e1ad2f591b87e944550c15b54e54f8189743289'Michael Niedermayer
* commit '0e1ad2f591b87e944550c15b54e54f8189743289': dxtory: add more compressed and uncompressed modes Conflicts: libavcodec/dxtory.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-24dxtory: compressed RGB555/RGB565 decoding supportKostya Shishkov
2014-01-24dxtory: add more compressed and uncompressed modesKostya Shishkov
2014-01-22Merge commit '025fd76e1a2623c858d8c686a73cc30980a314b0'Michael Niedermayer
* commit '025fd76e1a2623c858d8c686a73cc30980a314b0': dxtory: change error code for unexpected slice configuration Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-22Merge commit 'e91a3f1bdba9b4945e42c191d2e35e9844625fb4'Michael Niedermayer
* commit 'e91a3f1bdba9b4945e42c191d2e35e9844625fb4': dxtory: correctly handle YUV slices with average odd height Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-21dxtory: change error code for unexpected slice configurationKostya Shishkov
2014-01-21dxtory: correctly handle YUV slices with average odd heightKostya Shishkov
2013-08-30Reinstate proper FFmpeg license for all files.Thilo Borgmann
2013-08-03avcodec/dxtory: make def_lru[8] staticMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-28dxtory v2 supportKostya Shishkov
2013-03-14avcodec: av_log_ask_for_sample() ---> avpriv_request_sample()Diego Biurrun
2013-03-08lavc decoders: work with refcounted frames.Anton Khirnov
2012-12-05lavc: fix decode_frame() third parameter semantics for video decodersAnton Khirnov
It's got_frame, not data size
2012-12-05lavc: add a wrapper for AVCodecContext.get_buffer().Anton Khirnov
It will be useful in the upcoming transition to refcounted AVFrames.
2012-10-23dxtory: Replace AV_WN16A(AV_RN16A()) combination by AV_COPY16Diego Biurrun
2012-10-08Replace PIX_FMT_* -> AV_PIX_FMT_*, PixelFormat -> AVPixelFormatAnton Khirnov
2012-08-15Don't include common.h from avutil.hMartin Storsjö
Signed-off-by: Martin Storsjö <martin@martin.st>
2012-08-07Replace all CODEC_ID_* with AV_CODEC_ID_*Anton Khirnov
2011-12-10Dxtory capture format decoderKostya Shishkov
Signed-off-by: Anton Khirnov <anton@khirnov.net>