summaryrefslogtreecommitdiff
path: root/libavcodec/g2meet.c
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit '14b4e64eabc84c5a5e57c8ccc56bbeb95380823b'Michael Niedermayer2014-07-161-2/+7
|\ | | | | | | | | | | | | * commit '14b4e64eabc84c5a5e57c8ccc56bbeb95380823b': g2meet: allow size changes within original sizes Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * g2meet: allow size changes within original sizesVittorio Giovara2014-07-151-2/+7
| |
* | Merge commit 'e3fcb14347466095839c2a3c47ebecff02da891e'Michael Niedermayer2014-07-011-6/+6
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
| * dsputil: Split off IDCT bits into their own contextDiego Biurrun2014-06-301-6/+6
| |
* | Merge commit 'e74433a8e6fc00c8dbde293c97a3e45384c2c1d9'Michael Niedermayer2014-06-191-2/+5
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
| * dsputil: Split clear_block*/fill_block* off into a separate contextDiego Biurrun2014-06-181-2/+5
| |
* | Merge commit 'cba4e6062a02d5bf684e13a770be88aa1fec717e'Michael Niedermayer2014-04-021-2/+2
|\ \ | |/ | | | | | | | | | | | | | | | | | | * commit 'cba4e6062a02d5bf684e13a770be88aa1fec717e': More correct printf format specifiers Conflicts: libavcodec/h264_ps.c libavcodec/h264_refs.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * More correct printf format specifiersDiego Biurrun2014-04-021-2/+2
| | | | | | | | This avoids compiler warnings about argument and specifier type mismatch.
* | Merge commit 'cc8163e1a3601a56f722a4720516e860bf1c6198'Michael Niedermayer2014-03-221-9/+10
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
| * avcodec: more correct printf specifiersDiego Biurrun2014-03-221-9/+10
| |
* | Merge commit 'a801453423420915425f902bf9f9cbe982a55d87'Michael Niedermayer2014-03-091-30/+41
|\ \ | |/ | | | | | | | | | | | | | | | | * commit 'a801453423420915425f902bf9f9cbe982a55d87': g2meet: K&R formatting cosmetics Conflicts: libavcodec/g2meet.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * g2meet: K&R formatting cosmeticsDiego Biurrun2014-03-081-30/+41
| |
* | avcodec/g2meet: also reset local got_header when reseting the context got_headerMichael Niedermayer2014-03-021-0/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/g2meet: fix error returnsMichael Niedermayer2014-03-021-4/+8
| | | | | | | | | | | | | | | | | | | | 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>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2014-02-161-4/+5
|\ \ | |/ | | | | | | | | | | | | | | | | | | * qatar/master: g2meet: validate bpp and bitmasks in the display info Conflicts: libavcodec/g2meet.c See: ae95b2f8103cf0136889884fdf1c4e5136634991 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * g2meet: validate bpp and bitmasks in the display infoMaxim Poliakovski2014-02-161-1/+21
| | | | | | | | Signed-off-by: Kostya Shishkov <kostya.shishkov@gmail.com>
* | Merge commit '6477449243db4aab15a4db356e8354c60b5366ec'Michael Niedermayer2014-02-111-7/+16
|\ \ | |/ | | | | | | | | | | * commit '6477449243db4aab15a4db356e8354c60b5366ec': g2meet: make JPEG tile decoder operate on 8x8 block mask Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * g2meet: make JPEG tile decoder operate on 8x8 block maskKostya Shishkov2014-02-111-7/+16
| | | | | | | | This is needed for upcoming Go2Meeting (G2M2/G2M3) decoder.
| * g2meet: factor out seeking to the chunk endMaxim Poliakovski2014-02-111-13/+8
| | | | | | | | Signed-off-by: Kostya Shishkov <kostya.shishkov@gmail.com>
| * g2meet: rename FRAME_INFO to more appropriate DISPLAY_INFOMaxim Poliakovski2014-02-091-4/+4
| | | | | | | | Signed-off-by: Kostya Shishkov <kostya.shishkov@gmail.com>
* | g2meet: Validate bpp and bitmasks in the display infoMaxim Poliakovski2014-02-081-1/+20
| | | | | | | | | | | | | | That prevents processing of media files with incompatible or unsupported settings. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | g2meet: factor out chunk seekingMaxim Poliakovski2014-02-081-13/+8
| | | | | | | | | | | | This version requires fewer code and is safer. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | g2meet: Rename FRAME_INFO to more appropriate DISPLAY_INFOMaxim Poliakovski2014-02-081-4/+4
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/g2meet: check the return code of ff_set_dimensions()Michael Niedermayer2013-12-101-2/+5
| | | | | | | | | | | | | | | | | | 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>
* | Merge commit '9b8d11a76ae7bca8bbb58abb822138f8b42c776c'Michael Niedermayer2013-12-091-11/+6
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | * 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>
| * avcodec: Use av_reallocp where suitableAlexandra Khirnova2013-12-091-11/+6
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-11-301-1/+2
|\ \ | |/ | | | | | | | | | | * qatar/master: go2meeting: disallow tile dimensions that are not multiple of 16 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * go2meeting: disallow tile dimensions that are not multiple of 16Kostya Shishkov2013-11-291-1/+2
| | | | | | | | | | | | | | 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>
* | avcodec/g2meet: check available space before copying paletteMichael Niedermayer2013-11-271-0/+2
| | | | | | | | | | | | | | | | 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>
* | avcodec/g2meet: fix stride calculation, use correct format fieldMichael Niedermayer2013-11-271-1/+1
| | | | | | | | | | | | | | 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>
* | Merge commit '3b086317277e3f3b61c0343930d8e2570b278bd6'Michael Niedermayer2013-11-011-1/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | * 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>
| * g2meet: stop using deprecated avcodec_set_dimensionsAnton Khirnov2013-10-311-1/+1
| |
| * g2meet: Respect cursor_stride properly everywhereKostya Shishkov2013-09-251-0/+3
| | | | | | | | | | | | This fixes a regression with rgb cursors since b1e46988. Signed-off-by: Martin Storsjö <martin@martin.st>
* | avcodec/g2meet: fix regression with rgb cursorsMichael Niedermayer2013-09-251-1/+1
| | | | | | | | | | | | Fixes Ticket2972 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/g2meet: Fix framebuf sizeMichael Niedermayer2013-09-221-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | 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>
* | avcodec/g2meet: Fix order of align and pixel size multiplication.Michael Niedermayer2013-09-151-1/+1
| | | | | | | | | | | | | | | | Fixes out of array accesses Fixes Ticket2922 Found-by: ami_stuff Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/g2meet: remove redundant log messagePaul B Mahol2013-09-131-3/+1
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | Merge commit 'b1e469885362febce3d9a4678624e44a92f77da9'Michael Niedermayer2013-09-121-6/+1
|\ \ | |/ | | | | | | | | | | | | * commit 'b1e469885362febce3d9a4678624e44a92f77da9': g2meet: Allocate cursor buffers large enough to fit the aligned width See: 3c4c5ca1c194464f51de87534d15602f99bf9759 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * g2meet: Allocate cursor buffers large enough to fit the aligned widthMartin Storsjö2013-09-121-1/+1
| | | | | | | | | | | | Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org Signed-off-by: Martin Storsjö <martin@martin.st>
* | avcodec/g2meet: fix src pointer checks in kempf_decode_tile()Michael Niedermayer2013-08-071-1/+3
| | | | | | | | | | | | Fixes Ticket2842 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-07-301-1/+1
|\ \ | |/ | | | | | | | | | | | | | | | | * qatar/master: Replace remaining obsolete PIX_FMT names with AV_PIX_FMT equivalents Conflicts: libavcodec/g2meet.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Replace remaining obsolete PIX_FMT names with AV_PIX_FMT equivalentsDiego Biurrun2013-07-291-1/+1
| |
| * g2meet: Fix a typo in the height comparisonMichael Niedermayer2013-06-121-1/+1
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | replace some deprecated definesPaul B Mahol2013-07-061-1/+1
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | avcodec/g2meet: Check monochrome cursor widthMichael Niedermayer2013-06-141-0/+5
| | | | | | | | | | | | | | Fixes out of array write Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-06-121-29/+67
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | * 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>
| * g2meet: do not leak buffersKostya Shishkov2013-06-121-0/+2
| |
| * g2meet: more graceful cursor loadingKostya Shishkov2013-06-121-18/+53
| |
| * g2meet: reset dimensions on header parsing errorsKostya Shishkov2013-06-121-5/+12
| |
* | g2meet: fix typo in height comparissionMichael Niedermayer2013-06-091-1/+1
| | | | | | | | | | Fixes CID1030349 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
View Lorry Controller Status