generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
49,458 Commits 24 Branches 241 Tags 173 MiB
c2992b7053
Commit Graph

22517 Commits

Author SHA1 Message Date
Michael Niedermayer
c2992b7053 msrledec: move output pointer test up 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-30 16:33:45 +01:00
Michael Niedermayer
d8a7c4958e mpegvideo_enc: factor expression out 
Fixes "warning: dc[0..5] may be used uninitialized in this function"

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-30 16:24:33 +01:00
Michael Niedermayer
afb4bc3d29 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  movenc: Simplify code by using avio_wb24
  bfin: unbreak compilation

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-30 14:49:49 +01:00
Michael Niedermayer
71f8d70456 dirac/x86: fix compile without yasm 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-30 06:47:09 +01:00
Michael Niedermayer
4d3d362549 dirac/x86: fix compile without inline asm 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-30 02:51:59 +01:00
Carl Eugen Hoyos
3c3d68a976 Fix 1bpp palettized png with width not a multiple of 8. 
Fixes ticket #2204.
 2013-01-30 00:49:16 +01:00
Michael Niedermayer
dc8dd2f6e9 sanm: Check MV before using them. 
Fixes out of array reads

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-29 22:36:18 +01:00
Michael Niedermayer
0dfc01c2bb huffyuvdec: Skip len==0 cases 
Fixes vlc decoding for hypothetical files that would contain such cases.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-29 19:11:28 +01:00
Michael Niedermayer
4420b41442 huffyuvdec: check for and propagate failures from inside generate_joint_tables() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-29 18:18:51 +01:00
Michael Niedermayer
f67a0d1152 huffyuvdec: Check init_vlc() return codes. 
Prevents out of array writes

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-29 17:57:58 +01:00
Michael Niedermayer
ebe368d5d8 ac3enc: fix 'warning: block0 may be used uninitialized in this function' 
The pointer is also initialized to NULL for safety.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-29 16:15:02 +01:00
Luca Barbato
4e0bc996d9 bfin: unbreak compilation 
Added a missing header file.
 2013-01-29 14:59:21 +01:00
Michael Niedermayer
d1bbd304bf Merge commit 'f81c37e40fe3236d54da12aef9cdba48ba70ec31' 
* commit 'f81c37e40fe3236d54da12aef9cdba48ba70ec31':
  vf_delogo: fix an uninitialized read.
  h264: remove obsolete comment.
  mpegvideo: remove some unused variables from Picture.
  utvideoenc/v410enc: do not set AVFrame.reference.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-29 14:25:24 +01:00
Michael Niedermayer
3c8085dc42 Merge commit 'e6b1c3bbe7082c71ea8ee8ac83698c156c9e4838' 
* commit 'e6b1c3bbe7082c71ea8ee8ac83698c156c9e4838':
  pthread: make ff_thread_release_buffer idempotent.
  mvi: set framerate

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-29 14:19:56 +01:00
Michael Niedermayer
31d8d61f59 Merge commit 'aec50f79e7460340a148a3096fe212d67edc2c64' 
* commit 'aec50f79e7460340a148a3096fe212d67edc2c64':
  rawdec: use AVPALETTE_SIZE instead of magic constants.
  mimic: remove a pointless cast.
  mdec: return meaningful error codes.

Conflicts:
	libavcodec/rawdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-29 14:10:11 +01:00
Michael Niedermayer
f02033b98b Merge commit 'f713411d4cfbd9c467aeda77b16ca6bc4db55d10' 
* commit 'f713411d4cfbd9c467aeda77b16ca6bc4db55d10':
  mdec: cosmetics, reformat

Conflicts:
	libavcodec/mdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-29 13:57:57 +01:00
Michael Niedermayer
14aa358c20 Merge commit '098eed95bc1a6b2c8ac97f126f62bb74699670cf' 
* commit '098eed95bc1a6b2c8ac97f126f62bb74699670cf':
  mdec: merge mdec_common_init() into decode_init().
  eatgv: use fixed-width types where appropriate.
  x86: Simplify some arch conditionals
  bfin: Separate VP3 initialization code

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-29 13:48:38 +01:00
Michael Niedermayer
8265c0f43a Merge commit 'f550583c00e231b587d8ef98451cfbb6b6561eb6' 
* commit 'f550583c00e231b587d8ef98451cfbb6b6561eb6':
  bfin: update VP3 idct

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-29 13:40:44 +01:00
Paul B Mahol
8a6ae87b99 lavc: move deprecated audio_resample* bellow 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-01-29 11:08:39 +00:00
Anton Khirnov
76e74e4831 h264: remove obsolete comment. 2013-01-29 07:32:47 +01:00
Anton Khirnov
47318953dd mpegvideo: remove some unused variables from Picture. 2013-01-29 07:32:36 +01:00
Anton Khirnov
231fd1ed39 utvideoenc/v410enc: do not set AVFrame.reference. 
That field will be deprecated.
 2013-01-29 07:32:21 +01:00
Anton Khirnov
e6b1c3bbe7 pthread: make ff_thread_release_buffer idempotent. 
I.e. don't do anything on already released frames.
 2013-01-29 07:32:10 +01:00
Anton Khirnov
aec50f79e7 rawdec: use AVPALETTE_SIZE instead of magic constants. 2013-01-29 07:31:43 +01:00
Anton Khirnov
e6da5d215b mimic: remove a pointless cast. 2013-01-29 07:31:24 +01:00
Anton Khirnov
30d62507cd mdec: return meaningful error codes. 2013-01-29 07:31:15 +01:00
Anton Khirnov
f713411d4c mdec: cosmetics, reformat 2013-01-29 07:27:36 +01:00
Anton Khirnov
098eed95bc mdec: merge mdec_common_init() into decode_init(). 
There is no point in keeping those two functions separate.
 2013-01-29 07:27:23 +01:00
Anton Khirnov
f1c395944c eatgv: use fixed-width types where appropriate. 2013-01-29 07:27:08 +01:00
Michael Niedermayer
11c99c78ba h264: check the pixel format directly and force a reinit on mismatches. 
The existing checks are insufficient to detect a pixel format
changes in case of some damaged streams.
Fixes inconsistency and later out of array accesses

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-29 04:40:04 +01:00
Piotr Bandurski
f9a8eeb08c iff/deep: fix rle32 on big-endian 
Fixes ticket #2197.

Signed-off-by: Peter Ross <pross@xvid.org>
 2013-01-29 11:01:19 +11:00
Diego Biurrun
c59211b437 x86: Simplify some arch conditionals 2013-01-29 00:10:53 +01:00
Paul B Mahol
9efceaf1f7 takdec: switch to init_get_bits8() 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-01-28 22:47:30 +00:00
Michael Niedermayer
3939b790f2 wmavoicedec: use the checked bitstream, reader 
Fixes out of array reads

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-28 23:13:22 +01:00
Michael Niedermayer
14c8ee00ff vp3dec: move threads check out of header packet type check 
Prevents reconfiguration with threads which is unsupported
and would bring the contexts into an inconsistent state.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-28 22:46:48 +01:00
Diego Biurrun
438ea561ad bfin: Separate VP3 initialization code 2013-01-28 21:03:12 +01:00
Luca Barbato
f550583c00 bfin: update VP3 idct 
The block must be set to 0.
 2013-01-28 21:00:59 +01:00
Michael Niedermayer
94ef1667bb dirac/x86: Fix handling blocksizes that are not a multiple of 4 
Fixes out of array accesses

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-28 20:55:11 +01:00
Michael Niedermayer
5c9cae7447 dirac: Only use MMX if MMX is available. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-28 20:00:55 +01:00
Michael Niedermayer
8c4aebb58d qdm2: increase noise_table size 
This prevents out of array reads. An alternative solution would be
to check the index but this would require several checks in the
inner loops

Yet another alternative would be to change the index reset logic
but this likely would introduce a difference to the binary decoder

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-28 19:41:51 +01:00
Michael Niedermayer
4484c722f6 alsdec/read_specific_config: check for init_get_bits failure 
This also fixes a potential integer overflow

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Reviewed-by: Thilo Borgmann <thilo.borgmann@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-28 15:42:18 +01:00
Michael Niedermayer
1146bbc5a6 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  x86: hpeldsp: Fix a typo, use the right register
  shorten: fix array subscript is below array bounds warning

Conflicts:
	libavcodec/shorten.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-28 14:25:19 +01:00
Michael Niedermayer
bb2f4ae434 Merge commit '05b0998f511ffa699407465d48c7d5805f746ad2' 
* commit '05b0998f511ffa699407465d48c7d5805f746ad2':
  dsputil: Fix error by not using redzone and register name
  swscale: GBRP output support

Conflicts:
	libswscale/output.c
	libswscale/swscale.c
	libswscale/swscale_internal.h
	libswscale/utils.c
	tests/ref/lavfi/pixdesc
	tests/ref/lavfi/pixfmts_copy
	tests/ref/lavfi/pixfmts_null
	tests/ref/lavfi/pixfmts_scale
	tests/ref/lavfi/pixfmts_vflip

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-28 14:11:31 +01:00
Piotr Bandurski
51e9d2dbc8 aasc: fix 16bpp on big-endian 2013-01-28 11:29:37 +00:00
Michael Niedermayer
834e9fb056 x86: hpeldsp: Fix a typo, use the right register 
This makes the code actually work.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-01-28 12:49:37 +02:00
Luca Barbato
4839fbe2d1 shorten: fix array subscript is below array bounds warning 
Incidentally fixes alpha builds.
 2013-01-28 07:24:51 +01:00
Daniel Kang
05b0998f51 dsputil: Fix error by not using redzone and register name 
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2013-01-28 07:23:20 +01:00
Michael Niedermayer
4ade824e1f mjpegdec: rgb mode is specific for ljpeg, disable it for others. 
Fixes null pointer dereference

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-27 23:47:23 +01:00
Michael Niedermayer
73abc3a634 aacdec: check init_get_bits return 
Also fixes an integer overflow

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-27 23:47:23 +01:00
Michael Niedermayer
8888c72fcf mjpegdec: fix memcmp size for *_count 
Fixes assertion failure

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-27 23:47:23 +01:00