virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity
60,011 Commits 37 Branches 400 Tags 465 MiB
eef74b2e97
Commit Graph

31 Commits

Author SHA1 Message Date
Michael Niedermayer
3af9d8269e avcodec/g2meet: check the return code of ff_set_dimensions() 
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-10 18:34:52 +01:00
Michael Niedermayer
8c677a9f06 Merge commit '9b8d11a76ae7bca8bbb58abb822138f8b42c776c' 
* 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-09 20:31:29 +01:00
Alexandra Khirnova
9b8d11a76a avcodec: Use av_reallocp where suitable 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-12-09 12:27:51 +02:00
Michael Niedermayer
5d9e663064 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  go2meeting: disallow tile dimensions that are not multiple of 16

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-30 04:49:54 +01:00
Kostya Shishkov
01f6df01b6 go2meeting: disallow tile dimensions that are not multiple of 16 
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-29 17:37:59 +01:00
Michael Niedermayer
6d9dad6a7c avcodec/g2meet: check available space before copying palette 
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-27 00:10:23 +01:00
Michael Niedermayer
83f7bd6dcf avcodec/g2meet: fix stride calculation, use correct format field 
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-27 00:10:23 +01:00
Michael Niedermayer
e6b9d71ad9 Merge commit '3b086317277e3f3b61c0343930d8e2570b278bd6' 
* 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-11-01 14:54:40 +01:00
Anton Khirnov
58c6239e85 g2meet: stop using deprecated avcodec_set_dimensions 2013-10-31 20:14:15 +01:00
Kostya Shishkov
4370f65be8 g2meet: Respect cursor_stride properly everywhere 
This fixes a regression with rgb cursors since b1e46988.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-09-25 17:42:01 +03:00
Michael Niedermayer
c88ac1e023 avcodec/g2meet: fix regression with rgb cursors 
Fixes Ticket2972

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-25 00:25:23 +02:00
Michael Niedermayer
e07ac727c1 avcodec/g2meet: Fix framebuf size 
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-22 00:04:39 +02:00
Michael Niedermayer
821a5938d1 avcodec/g2meet: Fix order of align and pixel size multiplication. 
Fixes out of array accesses
Fixes Ticket2922

Found-by: ami_stuff
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-15 16:33:27 +02:00
Paul B Mahol
23bd0335af avcodec/g2meet: remove redundant log message 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-09-13 20:41:12 +00:00
Michael Niedermayer
fa9e8bafc8 Merge commit 'b1e469885362febce3d9a4678624e44a92f77da9' 
* commit 'b1e469885362febce3d9a4678624e44a92f77da9':
  g2meet: Allocate cursor buffers large enough to fit the aligned width

See: 3c4c5ca1c1
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-12 14:48:55 +02:00
Martin Storsjö
b1e4698853 g2meet: Allocate cursor buffers large enough to fit the aligned width 
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-09-12 10:55:20 +03:00
Michael Niedermayer
2960576378 avcodec/g2meet: fix src pointer checks in kempf_decode_tile() 
Fixes Ticket2842

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-07 16:28:28 +02:00
Michael Niedermayer
000f8bcd03 Merge remote-tracking branch 'qatar/master' 
* 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-30 12:03:12 +02:00
Diego Biurrun
78b4bfdb84 Replace remaining obsolete PIX_FMT names with AV_PIX_FMT equivalents 2013-07-29 23:46:51 +02:00
Paul B Mahol
d64f3b72e0 replace some deprecated defines 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-07-06 05:43:24 +00:00
Michael Niedermayer
3c4c5ca1c1 avcodec/g2meet: Check monochrome cursor width 
Fixes out of array write

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-14 21:14:31 +02:00
Michael Niedermayer
7ad5708691 g2meet: Fix a typo in the height comparison 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-06-12 13:45:53 +02:00
Michael Niedermayer
d3c4ea8b35 Merge remote-tracking branch 'qatar/master' 
* 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-12 11:53:27 +02:00
Kostya Shishkov
7dfc3381dd g2meet: do not leak buffers 2013-06-12 09:54:45 +02:00
Kostya Shishkov
4d960d7f60 g2meet: more graceful cursor loading 2013-06-12 09:54:45 +02:00
Kostya Shishkov
767ae86cee g2meet: reset dimensions on header parsing errors 2013-06-12 09:54:45 +02:00
Michael Niedermayer
2d8f880a9b g2meet: fix typo in height comparission 
Fixes CID1030349
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-09 16:55:10 +02:00
Michael Niedermayer
ada497e616 g2meet: Check cursor parameters before writing them in the context 
Fixes out of array access

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-09 12:00:57 +02:00
Michael Niedermayer
6d3bcbb211 avcodec/g2meet: check framebuf has been allocated before use 
Fixes null pointer dereference

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-09 03:09:26 +02:00
Michael Niedermayer
e5cdf9c03b Merge commit '2d66a58ccde05e764594bd7e5f0f9244634d0b2c' 
* 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-03 12:47:26 +02:00
Kostya Shishkov
2d66a58ccd Go2Webinar decoder 2013-06-03 09:24:55 +02:00