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
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.
2014-02-11g2meet: factor out seeking to the chunk endMaxim Poliakovski
Signed-off-by: Kostya Shishkov <kostya.shishkov@gmail.com>
2014-02-09g2meet: rename FRAME_INFO to more appropriate DISPLAY_INFOMaxim Poliakovski
Signed-off-by: Kostya Shishkov <kostya.shishkov@gmail.com>
2014-02-09g2meet: Validate bpp and bitmasks in the display infoMaxim Poliakovski
That prevents processing of media files with incompatible or unsupported settings. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-02-09g2meet: factor out chunk seekingMaxim Poliakovski
This version requires fewer code and is safer. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-02-09g2meet: Rename FRAME_INFO to more appropriate DISPLAY_INFOMaxim Poliakovski
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-12-10avcodec/g2meet: check the return code of ff_set_dimensions()Michael Niedermayer
This is currently redundant as the checks before it are tighter than the checks in ff_set_dimensions() but its more robust not to depend on that. Fixes CID1135739 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-12-09Merge commit '9b8d11a76ae7bca8bbb58abb822138f8b42c776c'Michael Niedermayer
* commit '9b8d11a76ae7bca8bbb58abb822138f8b42c776c': avcodec: Use av_reallocp where suitable Conflicts: libavcodec/bitstream.c libavcodec/eatgv.c libavcodec/flashsv.c libavcodec/libtheoraenc.c libavcodec/libvpxenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-12-09avcodec: Use av_reallocp where suitableAlexandra Khirnova
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-11-30Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: go2meeting: disallow tile dimensions that are not multiple of 16 Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-29go2meeting: disallow tile dimensions that are not multiple of 16Kostya Shishkov
Original decoder seems to always use 176x128 tiles anyway and this helps avoiding lots of issues with odd tile sizes in fuzzed files. Signed-off-by: Anton Khirnov <anton@khirnov.net>
2013-11-27avcodec/g2meet: check available space before copying paletteMichael Niedermayer
Fixes out of array read Fixes: asan_heap-uaf_ae6067_5415_g2m4.wmv Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-27avcodec/g2meet: fix stride calculation, use correct format fieldMichael Niedermayer
Fixes out of array accesses Fixes: asan_heap-oob_ae5f63_5415_g2m4.wmv Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-01Merge commit '3b086317277e3f3b61c0343930d8e2570b278bd6'Michael Niedermayer
* commit '3b086317277e3f3b61c0343930d8e2570b278bd6': h26[13]dec: stop using deprecated avcodec_set_dimensions gifdec: stop using deprecated avcodec_set_dimensions g2meet: stop using deprecated avcodec_set_dimensions Conflicts: libavcodec/gifdec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-31g2meet: stop using deprecated avcodec_set_dimensionsAnton Khirnov
2013-09-25g2meet: Respect cursor_stride properly everywhereKostya Shishkov
This fixes a regression with rgb cursors since b1e46988. Signed-off-by: Martin Storsjö <martin@martin.st>
2013-09-25avcodec/g2meet: fix regression with rgb cursorsMichael Niedermayer
Fixes Ticket2972 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-22avcodec/g2meet: Fix framebuf sizeMichael Niedermayer
Currently the code can in some cases draw tiles that hang outside the allocated buffer. This patch increases the buffer size to avoid out of array accesses. An alternative would be to fail if such tiles are encountered. I do not know if any valid files use such hanging tiles. Fixes Ticket2971 Found-by: ami_stuff Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-15avcodec/g2meet: Fix order of align and pixel size multiplication.Michael Niedermayer
Fixes out of array accesses Fixes Ticket2922 Found-by: ami_stuff Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-14avcodec/g2meet: remove redundant log messagePaul B Mahol
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-09-12Merge commit 'b1e469885362febce3d9a4678624e44a92f77da9'Michael Niedermayer
* commit 'b1e469885362febce3d9a4678624e44a92f77da9': g2meet: Allocate cursor buffers large enough to fit the aligned width See: 3c4c5ca1c194464f51de87534d15602f99bf9759 Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-12g2meet: Allocate cursor buffers large enough to fit the aligned widthMartin Storsjö
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org Signed-off-by: Martin Storsjö <martin@martin.st>
2013-08-07avcodec/g2meet: fix src pointer checks in kempf_decode_tile()Michael Niedermayer
Fixes Ticket2842 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-30Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: Replace remaining obsolete PIX_FMT names with AV_PIX_FMT equivalents Conflicts: libavcodec/g2meet.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-30Replace remaining obsolete PIX_FMT names with AV_PIX_FMT equivalentsDiego Biurrun
2013-07-06replace some deprecated definesPaul B Mahol
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-06-14avcodec/g2meet: Check monochrome cursor widthMichael Niedermayer
Fixes out of array write Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-06-12g2meet: Fix a typo in the height comparisonMichael Niedermayer
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-06-12Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: g2meet: do not leak buffers g2meet: more graceful cursor loading g2meet: reset dimensions on header parsing errors Conflicts: libavcodec/g2meet.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-06-12g2meet: do not leak buffersKostya Shishkov
2013-06-12g2meet: more graceful cursor loadingKostya Shishkov
2013-06-12g2meet: reset dimensions on header parsing errorsKostya Shishkov
2013-06-09g2meet: fix typo in height comparissionMichael Niedermayer
Fixes CID1030349 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-06-09g2meet: Check cursor parameters before writing them in the contextMichael Niedermayer
Fixes out of array access Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-06-09avcodec/g2meet: check framebuf has been allocated before useMichael Niedermayer
Fixes null pointer dereference Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-06-03Merge commit '2d66a58ccde05e764594bd7e5f0f9244634d0b2c'Michael Niedermayer
* commit '2d66a58ccde05e764594bd7e5f0f9244634d0b2c': Go2Webinar decoder Conflicts: Changelog configure libavcodec/avcodec.h libavcodec/codec_desc.c libavcodec/version.h libavformat/riff.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-06-03Go2Webinar decoderKostya Shishkov
    generated by cgit v1.2.3 (git 2.25.1) at 2024-09-05 04:01:02 +0300