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
path: root/libavcodec/g2meet.c
AgeCommit message (Collapse)Author
2017-10-04libavcodec/blockdsp : add AVX versionMartin Vignali
Also modify the required alignment, to 32 instead of 16 for several codecs Signed-off-by: James Almer <jamrial@gmail.com>
2017-03-31Merge commit '67deba8a416d818f3d95aef0aa916589090396e2'Clément Bœsch
* commit '67deba8a416d818f3d95aef0aa916589090396e2': Use avpriv_report_missing_feature() where appropriate Merged-by: Clément Bœsch <cboesch@gopro.com>
2016-11-08Use avpriv_report_missing_feature() where appropriateDiego Biurrun
2016-03-09Use correct msvc type specifiers for ptrdiff_t and size_t.Carl Eugen Hoyos
2016-01-10avcodec/g2meet: Check for ff_els_decode_bit() failure in ↵Michael Niedermayer
epic_decode_run_length() Fixes invalid shift Fixes: g2m_left_shift_2.wmv Found-by: Piotr Bandurski <ami_stuff@o2.pl> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-10-10Merge commit '3a4d369ea4ded91b1178ae6e2ff0ab9ea470e344'Hendrik Leppkes
* commit '3a4d369ea4ded91b1178ae6e2ff0ab9ea470e344': g2m: Relax resolution change constraints Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2015-10-07g2m: Relax resolution change constraintsVittorio Giovara
Do not fail when original resolution is smaller than current one, as the frame buffer is resized automatically. Signed-off-by: Vittorio Giovara <vittorio.giovara at gmail.com>
2015-09-04avcodec/g2meet: Also clear tile dimensions on header_failMichael Niedermayer
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-09-04avcodec/g2meet: Fix potential overflow in tile dimensions checkMichael Niedermayer
Fixes CID1322351 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-28Merge commit '059a934806d61f7af9ab3fd9f74994b838ea5eba'Michael Niedermayer
* commit '059a934806d61f7af9ab3fd9f74994b838ea5eba': lavc: Consistently prefix input buffer defines Conflicts: doc/examples/decoding_encoding.c libavcodec/4xm.c libavcodec/aac_adtstoasc_bsf.c libavcodec/aacdec.c libavcodec/aacenc.c libavcodec/ac3dec.h libavcodec/asvenc.c libavcodec/avcodec.h libavcodec/avpacket.c libavcodec/dvdec.c libavcodec/ffv1enc.c libavcodec/g2meet.c libavcodec/gif.c libavcodec/h264.c libavcodec/h264_mp4toannexb_bsf.c libavcodec/huffyuvdec.c libavcodec/huffyuvenc.c libavcodec/jpeglsenc.c libavcodec/libxvid.c libavcodec/mdec.c libavcodec/motionpixels.c libavcodec/mpeg4videodec.c libavcodec/mpegvideo.c libavcodec/noise_bsf.c libavcodec/nuv.c libavcodec/nvenc.c libavcodec/options.c libavcodec/parser.c libavcodec/pngenc.c libavcodec/proresenc_kostya.c libavcodec/qsvdec.c libavcodec/svq1enc.c libavcodec/tiffenc.c libavcodec/truemotion2.c libavcodec/utils.c libavcodec/utvideoenc.c libavcodec/vc1dec.c libavcodec/wmalosslessdec.c libavformat/adxdec.c libavformat/aiffdec.c libavformat/apc.c libavformat/apetag.c libavformat/avidec.c libavformat/bink.c libavformat/cafdec.c libavformat/flvdec.c libavformat/id3v2.c libavformat/isom.c libavformat/matroskadec.c libavformat/mov.c libavformat/mpc.c libavformat/mpc8.c libavformat/mpegts.c libavformat/mvi.c libavformat/mxfdec.c libavformat/mxg.c libavformat/nutdec.c libavformat/oggdec.c libavformat/oggparsecelt.c libavformat/oggparseflac.c libavformat/oggparseopus.c libavformat/oggparsespeex.c libavformat/omadec.c libavformat/rawdec.c libavformat/riffdec.c libavformat/rl2.c libavformat/rmdec.c libavformat/rtpdec_latm.c libavformat/rtpdec_mpeg4.c libavformat/rtpdec_qdm2.c libavformat/rtpdec_svq3.c libavformat/sierravmd.c libavformat/smacker.c libavformat/smush.c libavformat/spdifenc.c libavformat/takdec.c libavformat/tta.c libavformat/utils.c libavformat/vqf.c libavformat/westwood_vqa.c libavformat/xmv.c libavformat/xwma.c libavformat/yop.c 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-27lavc: Consistently prefix input buffer definesVittorio Giovara
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-10avcodec/g2meet: Check R/G/B values in epic_decode_pixel_pred()Michael Niedermayer
Fixes: asan_double-free_d34593_861_smp3.wmv Found-by: Samuel Groß, Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-08avcodec/g2meet: Clear pointers after deallocationMichael Niedermayer
Fixes double free Found-by: Samuel Groß, Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-07-01Merge commit '9eec23b8a7fd0f91827bbc3ed0792c39a8cc9a8a'Michael Niedermayer
* commit '9eec23b8a7fd0f91827bbc3ed0792c39a8cc9a8a': g2meet: use av_ceil_log2 instead of a custom function Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-07-01Merge commit '4ccccd6c40a6d0ce85e96a6e37f558236e2a6a75'Michael Niedermayer
* commit '4ccccd6c40a6d0ce85e96a6e37f558236e2a6a75': g2meet: use an unsigned type for the djb hash Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-07-01g2meet: use av_ceil_log2 instead of a custom functionJanne Grunau
2015-07-01g2meet: use an unsigned type for the djb hashJanne Grunau
2015-07-01Merge commit '08c2d8f0aa679c2f060721d1d0d4f33d2ae32368'Michael Niedermayer
* commit '08c2d8f0aa679c2f060721d1d0d4f33d2ae32368': Go2Meeting decoder Conflicts: Changelog libavcodec/g2meet.c libavcodec/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-07-01Go2Meeting decoderKostya Shishkov
ELS and ePIC decoder courtesy of Maxim Poliakovski, cleanup and integration by Diego Biurrun. Signed-off-by: Diego Biurrun <diego@biurrun.de> Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2015-05-07avcodec/g2meet: Check init_get_bits8() return valueMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-07avcodec/g2meet: Use init_get_bits8()Michael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-20g2meet: Support G2M5 codec variantEric Zimmerman
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
2015-04-08Merge commit 'bb815dfc38b8ef7a89d6b9684ce0cdc296385d6d'Michael Niedermayer
* commit 'bb815dfc38b8ef7a89d6b9684ce0cdc296385d6d': g2meet: K&R formatting cosmetics Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-08g2meet: K&R formatting cosmeticsDiego Biurrun
2015-03-31Merge commit '4978850ca2cb1ec6908f5bc79cc592ca454d11e8'Michael Niedermayer
* commit '4978850ca2cb1ec6908f5bc79cc592ca454d11e8': build: Split JPEG-related tables off into a separate component Conflicts: configure Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-30build: Split JPEG-related tables off into a separate componentDiego Biurrun
2015-01-16avcodec/g2meet: Use av_mallocz_array() for framebuffer allocationMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-13g2meet: check ff_set_dimensions return valueVittorio Giovara
CC: libav-stable@libav.org Bug-Id: CID 1135739
2014-10-30avcodec/g2meet: check tile dimensions to avoid integer overflowMichael Niedermayer
Fixes out of array access Fixes: asan_heap-oob_12a55d3_30_029.wmv Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-24Added support for G2M5 codecEric Zimmerman
This has also been independently found and fixed similarly by carl in f4a3bbf4a3cd375121ea2495817f3e50e831ed48 The 2nd magic check is taken from carls implementation Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-16Merge commit '14b4e64eabc84c5a5e57c8ccc56bbeb95380823b'Michael Niedermayer
* commit '14b4e64eabc84c5a5e57c8ccc56bbeb95380823b': g2meet: allow size changes within original sizes Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-16g2meet: allow size changes within original sizesVittorio Giovara
2014-07-01Merge commit 'e3fcb14347466095839c2a3c47ebecff02da891e'Michael Niedermayer
* commit 'e3fcb14347466095839c2a3c47ebecff02da891e': dsputil: Split off IDCT bits into their own context Conflicts: configure libavcodec/aic.c libavcodec/arm/Makefile libavcodec/arm/dsputil_init_arm.c libavcodec/arm/dsputil_init_armv6.c libavcodec/asvdec.c libavcodec/dnxhdenc.c libavcodec/dsputil.c libavcodec/dvdec.c libavcodec/dxva2_mpeg2.c libavcodec/intrax8.c libavcodec/mdec.c libavcodec/mjpegdec.c libavcodec/mjpegenc_common.h libavcodec/mpegvideo.c libavcodec/ppc/dsputil_altivec.h libavcodec/ppc/dsputil_ppc.c libavcodec/ppc/idctdsp.c libavcodec/x86/Makefile libavcodec/x86/dsputil_init.c libavcodec/x86/dsputil_mmx.c libavcodec/x86/dsputil_x86.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-30dsputil: Split off IDCT bits into their own contextDiego Biurrun
2014-06-19Merge commit 'e74433a8e6fc00c8dbde293c97a3e45384c2c1d9'Michael Niedermayer
* commit 'e74433a8e6fc00c8dbde293c97a3e45384c2c1d9': dsputil: Split clear_block*/fill_block* off into a separate context Conflicts: configure libavcodec/asvdec.c libavcodec/dnxhddec.c libavcodec/dnxhdenc.c libavcodec/dsputil.h libavcodec/eamad.c libavcodec/intrax8.c libavcodec/mjpegdec.c libavcodec/ppc/dsputil_ppc.c libavcodec/vc1dec.c libavcodec/x86/dsputil_init.c libavcodec/x86/dsputil_mmx.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-19dsputil: Split clear_block*/fill_block* off into a separate contextDiego Biurrun
2014-04-02Merge commit 'cba4e6062a02d5bf684e13a770be88aa1fec717e'Michael Niedermayer
* commit 'cba4e6062a02d5bf684e13a770be88aa1fec717e': More correct printf format specifiers Conflicts: libavcodec/h264_ps.c libavcodec/h264_refs.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-02More correct printf format specifiersDiego Biurrun
This avoids compiler warnings about argument and specifier type mismatch.
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-03-09Merge commit 'a801453423420915425f902bf9f9cbe982a55d87'Michael Niedermayer
* commit 'a801453423420915425f902bf9f9cbe982a55d87': g2meet: K&R formatting cosmetics Conflicts: libavcodec/g2meet.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-08g2meet: K&R formatting cosmeticsDiego Biurrun
2014-03-02avcodec/g2meet: also reset local got_header when reseting the context got_headerMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-02avcodec/g2meet: fix error returnsMichael Niedermayer
Fixes out of array accesses This should not affect any release Fixes: 8ab69af9e5a7a7e20fe04cdd25c0d6e7-asan_heap-oob_e72b82_5505_cov_2278389485_g2m4.wmv Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-02-16Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: g2meet: validate bpp and bitmasks in the display info Conflicts: libavcodec/g2meet.c See: ae95b2f8103cf0136889884fdf1c4e5136634991 Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-02-16g2meet: validate bpp and bitmasks in the display infoMaxim Poliakovski
Signed-off-by: Kostya Shishkov <kostya.shishkov@gmail.com>
2014-02-12Merge commit '6477449243db4aab15a4db356e8354c60b5366ec'Michael Niedermayer
* commit '6477449243db4aab15a4db356e8354c60b5366ec': g2meet: make JPEG tile decoder operate on 8x8 block mask Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-02-11g2meet: make JPEG tile decoder operate on 8x8 block maskKostya Shishkov
This is needed for upcoming Go2Meeting (G2M2/G2M3) decoder.
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-21 16:51:01 +0300