ffmpeg/FFmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-09-22 22:36:38 +00:00
Code Issues Packages Projects Releases Wiki Activity
49,429 Commits 36 Branches 398 Tags 535 MiB
31d8d61f59
Commit Graph

49429 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Michael Niedermayer
1336382c6d avfilter_get_audio_buffer_ref_from_frame: fix handling of >8 channels 
Found-by: inferno@chromium.org
Reported-by: Dale Curtis <dalecurtis@google.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-28 21:45:16 +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
Stephan Hilb
0501d06468 lavd/v4l2: use avcodec_find_decoder in list_formats 
Because libavdevice/v4l2 is a demuxer, it makes sense to look for
decoders instead of encoders when listing the formats supported by the
device.

Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
 2013-01-28 00:11:49 +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
Carl Eugen Hoyos
d88d0b6db6 Write forced track flag to matroska files. 
Based on a patch by Daniel Pielmeier, daniel pielmeier gmail
Fixes a part of ticket #1815.
 2013-01-27 23:24:52 +01:00
Carl Eugen Hoyos
a6a5101654 Fix some avi rawvideo formats on big endian. 
Fixes ticket #2196.
 2013-01-27 22:49:48 +01:00
Michael Niedermayer
4eb93bed4e swscale: GBRP output support 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2013-01-27 15:28:07 -05:00
Michael Niedermayer
deefdf9788 avpriv_mpeg4audio_get_config: check init_get_bits() return code. 
Fixes null pointer dereference

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-27 21:18:00 +01:00
Michael Niedermayer
96f452ac64 aacdec: check channel count 
Prevent out of array accesses

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-27 20:38:00 +01:00
Matthieu Bouron
9d602a0b0e lavc/dnxhdenc: print valid profiles when codec parameters are invalid 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-27 18:44:16 +01:00
Matthieu Bouron
5b83b2da08 lavc/dnxhddata: add frame_rates field to cid table 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-27 18:44:16 +01:00
Giorgio Vazzana
93d319a582 lavd/v4l2: select input immediately after opening the device 
After opening the device, the first thing we should do is selecting the
input. This is because the image formats (VIDIOC_ENUM_FMT ioctl) and the
standards (VIDIOC_ENUMSTD ioctl) supported may depend on the selected
input ([1] and [2]).

[1] http://linuxtv.org/downloads/v4l-dvb-apis/vidioc-enum-fmt.html
[2] http://linuxtv.org/downloads/v4l-dvb-apis/vidioc-enumstd.html

Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
 2013-01-27 18:19:27 +01:00
Stefano Sabatini
5306976be8 lavd/v4l2: sanitize logic of device_try_init(), so that it properly signal errors 
Make device_try_init() return an error value, and allow to properly
report errors which are not due to a wrong pixel/codec configuration.

In particular, report intelligible feedback in case of busy device.
 2013-01-27 17:58:16 +01:00
Stefano Sabatini
27db2bf000 ffmpeg: remove -crop* and -pad* options 
The options have been deprecated and are non-operational since more than
two years.
 2013-01-27 16:56:47 +01:00
Stefano Sabatini
43af18ef8b ffmpeg: implement -force_key_frames expression evalution 2013-01-27 16:56:47 +01:00
Michael Niedermayer
2b14344ab3 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  arm: vp8: Fix the plain-armv6 version of vp8_luma_dc_wht

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-27 16:47:56 +01:00
Michael Niedermayer
f5c0b9aa6f Merge commit '96753bd00d6d4046db6818c0aadc21bf2a11d77b' 
* commit '96753bd00d6d4046db6818c0aadc21bf2a11d77b':
  dsputil: x86: Correct the number of registers used in put_no_rnd_pixels16_l2
  dsputil: add missing HAVE_YASM guard
  hwaccel: do not offer unsupported pixel formats
  vdpau: add missing pixel format for H.264

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-27 16:30:01 +01:00
Michael Niedermayer
edde562130 AVG_PIXELS8_XY2: fix typo, make code actually work 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-27 15:50:26 +01:00
Daniel Kang
5327a45552 dsputil: x86: Correct the number of registers used in put_no_rnd_pixels16_l2 
put_no_rnd_pixels16_l2 allocated 5 instead of 6 registers.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2013-01-27 15:20:44 +01:00
Daniel Kang
d9e62f368d dsputil: add missing HAVE_YASM guard 
Fix compile error under
"--disable-optimizations --disable-yasm --disable-inline-asm"

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2013-01-27 15:20:35 +01:00