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

github.com/FFmpeg/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2015-09-05avcodec/hapdec: Check section_size for non negativity in parse_section_header()Michael Niedermayer
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-28Merge commit '3ee217853a6741b829a2683f49c590618891b1ab'Michael Niedermayer
* commit '3ee217853a6741b829a2683f49c590618891b1ab': Support the Hap chunked frame format Conflicts: libavcodec/hap.h libavcodec/hapdec.c libavcodec/version.h See: c7e6443441ed5c1b5f64067dfbf4956bc2c6acbb Merged-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-28Merge commit '43dd004747fa697396b47d034a80e069facbea09'Michael Niedermayer
* commit '43dd004747fa697396b47d034a80e069facbea09': hap: Move some per-stream setup into decoder init rather than per-frame Conflicts: libavcodec/hapdec.c See: 6074956fa1d2617ac602e49931b06df0a751370e Merged-by: Michael Niedermayer <michael@niedermayer.cc>
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-27Support the Hap chunked frame formatTom Butterworth
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
2015-07-27hap: Move some per-stream setup into decoder init rather than per-frameTom Butterworth
This change will reject frames with a texture type which does not match the stream description. Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
2015-07-27lavc: AV-prefix all codec capabilitiesVittorio Giovara
Express bitfields more simply. Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
2015-07-24avcodec/hapdec: Check that there is sufficient input dataMichael Niedermayer
Fixes Ticket4729 Found-by: ami_stuff Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-23snappy: Refactor so ff_snappy_uncompress() uses an existing bufferTom Butterworth
Some uses of Snappy require uncompressing to positions within an existing buffer. Also adds a function to get the uncompressed length of Snappy data.
2015-07-23hap: Fix slice size computationTom Butterworth
A bug was introduced in 977105407cae55876041dddbf4ce0934cdd4cd6c whereby when frame height wasn't divisible by the number of threads, pixels would be omitted from the bottom rows during decode. Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2015-07-23Merge commit 'ae5a8dca675ee544178225256893e679b750cb63'Michael Niedermayer
* commit 'ae5a8dca675ee544178225256893e679b750cb63': hap: Fix slice size computation Conflicts: libavcodec/hapdec.c Merged-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-22Support the Hap chunked frame formatTom Butterworth
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-21Merge commit '977105407cae55876041dddbf4ce0934cdd4cd6c'Michael Niedermayer
* commit '977105407cae55876041dddbf4ce0934cdd4cd6c': hap: Decode using optimal slices sizes Merged-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-21avcodec/hapdec: log reason for failure when texture type doesn't match streamTom Butterworth
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-21hap: Decode using optimal slices sizesLuca Barbato
Enjoy some cache locality and use less threads. About 5x speedup (from 60ms to 12ms to decode a 4k frame). Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2015-07-21avcodec/hapdec: don't log texture format every frame, do it once per decode ↵Tom Butterworth
session Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-16avcodec/snappy: refactor so ff_snappy_uncompress uses an existing bufferTom Butterworth
Some uses of Snappy require uncompressing to positions within an existing buffer. Also adds a function to get the uncompressed length of Snappy data. Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-16avcodec/hap: move some per-stream setup into decoder init rather than per-frameTom Butterworth
This change will reject frames with a texture type which doesn't match the stream description. Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-06-30lavc/hapenc: Silence a warning for multithreaded encoding.Carl Eugen Hoyos
2015-06-22Merge commit '7ca3e5203f133eb41a0b5c3a1d753a7427ba72e7'Michael Niedermayer
* commit '7ca3e5203f133eb41a0b5c3a1d753a7427ba72e7': Hap decoder and encoder Conflicts: Changelog configure doc/general.texi libavcodec/allcodecs.c libavcodec/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-06-22Hap decoder and encoderVittorio Giovara
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>