Michael Niedermayer
5f312139df
Merge commit '45ee556d51ef04d79d52bf6b0b7f28a4d231cb0c'
...
* commit '45ee556d51ef04d79d52bf6b0b7f28a4d231cb0c':
qdm2: Whitespace cosmetics
flac: use meaningful return values
Conflicts:
libavcodec/flacdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-29 11:34:07 +02:00
Michael Niedermayer
688331c51c
Merge commit 'e13a929314e4a9a09d3146648f876f162f46cc32'
...
* commit 'e13a929314e4a9a09d3146648f876f162f46cc32':
xl: K&R formatting cosmetics
Conflicts:
libavcodec/xl.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-29 11:08:02 +02:00
Paul B Mahol
19da86f3ff
targaenc: remove unused TargaContext
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-07-28 22:42:40 +00:00
Paul B Mahol
e999f2339a
truemotion2: make code independent of sizeof(AVFrame)
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-07-28 22:42:40 +00:00
Paul B Mahol
a5155294e5
pnm: do not set avctx->coded_frame
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-07-28 22:27:36 +00:00
Paul B Mahol
329221eee7
pnm: fix 255 < maxval < 65535 for pam with depth 1
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-07-28 22:27:36 +00:00
Carl Eugen Hoyos
2c046c718a
Revert "Avoid overflows when reading pgm files with maxval != 255 and != 65535."
...
The patch worked on little endian because pgm decoding was broken
but it was not correct in any way.
This reverts commit 7651c0e49b
.
2013-07-29 00:05:43 +02:00
Paul B Mahol
768e40b451
Revert "pnm: remove nonsense code"
...
Breaks decoding pgms with 256 < maxval < 65535.
Found-by: Carl Eugen Hoyos <cehoyos@ag.or.at>.
This reverts commit a0348d0966
.
2013-07-28 21:45:37 +00:00
Luca Barbato
3ca1dd2502
xl: Make sure the width is valid
...
And undo the wrong commit f1cb490d6d
CC: libav-stable@libav.org
2013-07-28 19:36:44 +02:00
Carl Eugen Hoyos
7651c0e49b
Avoid overflows when reading pgm files with maxval != 255 and != 65535.
...
libjpeg v6b apparently does not initialize the most significant bits
to zero when writing 12bit pgm's with maxval 4095.
2013-07-28 19:07:06 +02:00
Carl Eugen Hoyos
7e8e8ba9cc
Assume gray8 if 1 < maxval <= 255 in pgm.
2013-07-28 18:12:23 +02:00
Carl Eugen Hoyos
ae4dc0b37a
Set bits_per_raw_sample when decoding mjpeg / ljpeg.
...
The ljpeg decoder also supports gray images with
8 - 15 bits per component.
2013-07-28 17:13:01 +02:00
Paul B Mahol
b09d86c636
utvideoenc: use av_image_copy_plane()
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2013-07-28 10:57:51 -04:00
Luca Barbato
62b1e3b103
aasc: Check minimum buffer size
...
Prevent some overreads.
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
2013-07-28 15:41:59 +02:00
Luca Barbato
45ee556d51
qdm2: Whitespace cosmetics
2013-07-28 14:58:19 +02:00
Luca Barbato
0e78ef0f94
flac: use meaningful return values
2013-07-28 14:58:18 +02:00
Michael Niedermayer
b0edd59994
Merge commit 'bf4b0ed1d5d323050a87c9f0ad1dd40860eb3da2'
...
* commit 'bf4b0ed1d5d323050a87c9f0ad1dd40860eb3da2':
Add missing deprecation attributes
Conflicts:
libavfilter/avfilter.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-28 13:44:34 +02:00
Luca Barbato
e13a929314
xl: K&R formatting cosmetics
2013-07-28 12:45:05 +02:00
Luca Barbato
f1cb490d6d
xl: Fix the buffer size check
...
Also make it the first check.
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
2013-07-28 12:45:05 +02:00
Michael Niedermayer
102397d2c1
Merge commit '16c22122c788b5e54a2f2e224bd0106429f0714c'
...
* commit '16c22122c788b5e54a2f2e224bd0106429f0714c':
h264: K&R formatting cosmetics
Conflicts:
libavcodec/h264.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-28 11:40:49 +02:00
Marton Balint
63c0113588
lavc: do not override format if neither text nor bitmap codec prop is set
...
Some decoders may output both, this way the decoder can set it.
Signed-off-by: Marton Balint <cus@passwd.hu>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-27 23:03:00 +02:00
Paul B Mahol
94ad38e2e8
dpx: use av_image_copy_plane()
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-07-27 20:51:14 +00:00
Paul B Mahol
6a57494204
dpxenc: cosmetics: reindent
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-07-27 20:45:48 +00:00
Paul B Mahol
9d099b9ae4
targa_y216dec: remove empty function
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-07-27 20:27:15 +00:00
Paul B Mahol
0909f3edbd
zmbv: return meaningful error code
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-07-27 20:21:33 +00:00
Paul B Mahol
60a7fac61b
utvideoenc: use av_image_copy_plane()
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-07-27 20:07:48 +00:00
Tim.Nicholson
84e345b38e
Forward interlaced field information from mov to v210 decoder.
...
Reported and tested by Dave Rice.
Signed-off-by: Carl Eugen Hoyos <cehoyos@ag.or.at>
2013-07-27 18:57:28 +02:00
Diego Biurrun
bf4b0ed1d5
Add missing deprecation attributes
2013-07-27 16:08:49 +02:00
Michael Niedermayer
3adf054b22
avcodec/vorbisenc: change 6 asserts to av_asserts()
...
speed relevant ones use av_assert2()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-27 15:23:13 +02:00
Michael Niedermayer
5e763920a4
avcodec/mpegvideo: update disabled assert() to av_assert0()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-27 15:23:13 +02:00
Paul B Mahol
88b071a473
exr: set pict_type
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-07-27 12:02:19 +00:00
Paul B Mahol
d9954ccff0
targa: set pict_type
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-07-27 12:02:18 +00:00
Paul B Mahol
3ea5d01a12
escape130: make "chroma_vals" static
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-07-27 12:02:18 +00:00
Paul B Mahol
6dbcecd78e
lclenc: allocate FF_INPUT_BUFFER_PADDING_SIZE for extradata
...
Also check return value.
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-07-27 12:02:18 +00:00
Paul B Mahol
573018c61f
lclenc: cosmetics: reindent
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-07-27 12:00:25 +00:00
Paul B Mahol
86e722ab97
sgidec: safer check for buffer overflow
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-07-27 12:00:25 +00:00
Paul B Mahol
997e2b59e3
sgidec: return meaningful error codes
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-07-27 12:00:25 +00:00
Paul B Mahol
5efa5103b0
sgidec: simplify return path
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-07-27 12:00:25 +00:00
Diego Biurrun
16c22122c7
h264: K&R formatting cosmetics
2013-07-27 10:47:38 +02:00
Michael Niedermayer
205f423e28
libavcodec/mpegvideo: change some asserts to av_assert0()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-26 22:29:55 +02:00
Michael Niedermayer
c88bbc01eb
avcodec/mpegvideo: replace assert about interlaced EC by debug av_log()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-26 22:29:47 +02:00
Paul B Mahol
1fa0284c57
qcelpdec: change asserts to av_asserts
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-07-26 18:32:27 +00:00
Paul B Mahol
fdf9296df7
sgienc: remove unused SgiContext
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-07-26 18:21:44 +00:00
Paul B Mahol
2868035d95
pcxenc: get rid of unused PCXContext
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-07-26 14:00:40 +00:00
Paul B Mahol
3838637bbb
yop: check return value of av_frame_alloc()
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-07-26 13:51:26 +00:00
Paul B Mahol
9437259276
vmnc: check return values of reallocation
...
Also avoid memory leaks.
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-07-26 13:49:36 +00:00
Paul B Mahol
cf5ab8b6f7
vmnc: make code independent of sizeof(AVFrame)
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-07-26 13:39:40 +00:00
Michael Niedermayer
46ad2d9e44
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
miscellaneous typo fixes
Conflicts:
configure
libavformat/avisynth.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-26 11:12:11 +02:00
Michael Niedermayer
5dc2c99055
Merge commit '93a51984a27f3ba84d4e6f13d0c704ee9891603e'
...
* commit '93a51984a27f3ba84d4e6f13d0c704ee9891603e':
mpeg12: Ignore slice threading if hwaccel is active
Conflicts:
libavcodec/mpeg12dec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-26 10:57:51 +02:00
Michael Niedermayer
bbc7d33a0d
Merge commit '582963a8156522582e55466be4a59974a8d909a5'
...
* commit '582963a8156522582e55466be4a59974a8d909a5':
vdpau: Fix VC-1 interlaced mode
Conflicts:
libavcodec/vdpau_vc1.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-26 10:51:42 +02:00
Michael Niedermayer
af7949fdea
Merge commit '4a2ef39442bf7f0150db07a1fbfcf8286e4d44a3'
...
* commit '4a2ef39442bf7f0150db07a1fbfcf8286e4d44a3':
cosmetics: Add '0' to float constants ending in '.'.
Conflicts:
libavcodec/ra288.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-26 10:43:12 +02:00
Michael Niedermayer
e28fabb4cb
Merge commit '6c145ecf785dc3d26ba3fed3ea9892cc80244625'
...
* commit '6c145ecf785dc3d26ba3fed3ea9892cc80244625':
twinvq: K&R formatting cosmetics
Conflicts:
libavcodec/twinvq.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-26 10:30:47 +02:00
Diego Biurrun
03039f4c8c
miscellaneous typo fixes
2013-07-25 19:43:32 +02:00
Rémi Denis-Courmont
93a51984a2
mpeg12: Ignore slice threading if hwaccel is active
...
Slice threading does not work with hardware acceleration, as decoding
is per-picture. This fixes Bugzilla #542 .
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2013-07-25 19:43:32 +02:00
Carl Eugen Hoyos
9375879d57
Show max bitrate for mpeg2 video streams in avcodec_string().
...
See also 25b7aa9
2013-07-25 19:08:19 +02:00
Rainer Hochecker
582963a815
vdpau: Fix VC-1 interlaced mode
...
VDPAU expects the bitstream value (0, 2 or 3).
libavcodec uses an enum (0, 1 or 2).
Signed-off-by: Rémi Denis-Courmont <remi@remlab.net>
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2013-07-25 14:19:17 +02:00
Diego Biurrun
4a2ef39442
cosmetics: Add '0' to float constants ending in '.'.
2013-07-25 11:33:23 +02:00
Diego Biurrun
6c145ecf78
twinvq: K&R formatting cosmetics
2013-07-25 11:17:06 +02:00
Michael Niedermayer
0815b23062
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
arm: Comment out unused labels in simple_idct_arm
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-25 10:15:08 +02:00
Michael Niedermayer
6db57fa8bc
avcodec/mjpegdec: Support RGBA lpegs
...
Fixes Ticket896
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-25 00:32:44 +02:00
Martin Storsjö
54ba52077c
arm: Comment out unused labels in simple_idct_arm
...
When building for iOS in thumb mode, gas-preprocessor.pl doesn't
mark unused labels as thumb functions (as it does for other
local labels, where it can figure out that they are functions
due to being referenced in branch instructions). This leads to
linker warnings for some of those local labels, such as:
ld: warning: ARM function not 4-byte aligned: __a_evaluation from
libavcodec/libavcodec.a(simple_idct_arm.o)
Therefore, comment them out since they don't have any function.
They do still have a value in documenting key points in the
assembly source though.
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-07-24 22:43:21 +03:00
Michael Niedermayer
101c7ea906
avcodec/mpeg12dec: remove commented out assert
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-24 13:00:04 +02:00
Michael Niedermayer
800637709c
alsdec: minor simplification in read_block()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-24 12:36:52 +02:00
Michael Niedermayer
7dec8512be
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
8bps: Make the bound-checks consistent
Conflicts:
libavcodec/8bps.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-24 12:01:29 +02:00
Michael Niedermayer
da0f67b177
Merge commit 'bd7b4da0f4627bb6c4a7c2575da83fe6b261a21c'
...
* commit 'bd7b4da0f4627bb6c4a7c2575da83fe6b261a21c':
8bps: Bound-check the input buffer
Conflicts:
libavcodec/8bps.c
See: 66ff90f4a3
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-24 11:45:54 +02:00
Michael Niedermayer
82654172ce
Merge commit '2f034f255c49050e894ab9b88087c09ebe249f3f'
...
* commit '2f034f255c49050e894ab9b88087c09ebe249f3f':
4xm: Reject not a multiple of 16 dimension
The newly added checks are redundant and thus replaced by asserts
See: db5b487551
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-24 11:31:14 +02:00
Michael Niedermayer
a550926705
Merge commit 'ca488ad480360dfafcb5766f7bfbb567a0638979'
...
* commit 'ca488ad480360dfafcb5766f7bfbb567a0638979':
alsdec: Clean up error paths
Conflicts:
libavcodec/alsdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-24 10:31:10 +02:00
Michael Niedermayer
865f34823c
Merge commit '70ecc175c7b513a153ac87d1c5d219556ca55070'
...
* commit '70ecc175c7b513a153ac87d1c5d219556ca55070':
alsdec: Fix the clipping range
Conflicts:
libavcodec/alsdec.c
See: feaff427c0
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-24 10:15:50 +02:00
Michael Niedermayer
274a50ab57
avcodec/utils: Warn the user about the lack of a lock manager if insufficient locks are detected
...
A lock manager is not the only possibility to avoid open/close locking
issues but its easier and more robust than maintaining a lot of lock/unlock
calls.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-24 01:11:09 +02:00
Luca Barbato
6fd221e5f8
8bps: Make the bound-checks consistent
2013-07-23 23:03:37 +02:00
Luca Barbato
bd7b4da0f4
8bps: Bound-check the input buffer
...
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
2013-07-23 23:03:37 +02:00
Luca Barbato
2f034f255c
4xm: Reject not a multiple of 16 dimension
...
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
2013-07-23 23:03:37 +02:00
Luca Barbato
ca488ad480
alsdec: Clean up error paths
...
Fix at least a memory leak.
CC: libav-stable@libav.org
2013-07-23 23:03:37 +02:00
Luca Barbato
70ecc175c7
alsdec: Fix the clipping range
...
mcc_weightings is only 32 elements.
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
2013-07-23 23:03:37 +02:00
Michael Niedermayer
55db06af64
avcodec/utils: use av_assert0() to check validity of input pointers for start code search
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-23 21:23:09 +02:00
Michael Niedermayer
abc8110f7e
avcodec: add avcodec_chroma_pos_to_enum()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-23 03:11:28 +02:00
Michael Niedermayer
b7397857e2
avcodec: add avcodec_enum_to_chroma_pos()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-23 03:07:30 +02:00
clook
4443213d2e
avcodec/libopenjpegen: XYZ 12 bit support for libopenjpeg encoder
2013-07-23 01:02:41 +02:00
Martin Storsjö
69e6702c01
arm: Mangle external symbols properly in new vfp assembly files
...
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-07-22 14:48:30 +03:00
Martin Storsjö
47d57f24e3
arm: Mangle external symbols properly in new vfp assembly files
...
Reviewed-by: Kostya Shishkov
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-22 13:16:21 +02:00
Michael Niedermayer
23f250d2bc
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
arm: Add VFP-accelerated version of qmf_32_subbands
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-22 12:11:23 +02:00
Michael Niedermayer
366e415836
Merge commit '800ffab48a7844dd5dc0a33b8f6b8e5ed718cf2e'
...
* commit '800ffab48a7844dd5dc0a33b8f6b8e5ed718cf2e':
dcadsp: Add a new method, qmf_32_subbands
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-22 12:10:59 +02:00
Michael Niedermayer
c30eb74d18
Merge commit '8b9eba664edaddf9a304d3acbf0388b5c520781d'
...
* commit '8b9eba664edaddf9a304d3acbf0388b5c520781d':
arm: Add VFP-accelerated version of fft16
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-22 12:05:39 +02:00
Michael Niedermayer
bacba8e5d1
Merge commit 'ba6836c966debc56314ce2ef133c7f0c1fdfdeac'
...
* commit 'ba6836c966debc56314ce2ef133c7f0c1fdfdeac':
arm: Add VFP-accelerated version of dca_lfe_fir
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-22 12:04:28 +02:00
Michael Niedermayer
2305a6775d
Merge commit 'b63bb251ea6d6ba23295294e37a92625c0192206'
...
* commit 'b63bb251ea6d6ba23295294e37a92625c0192206':
arm: Add VFP-accelerated version of imdct_half
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-22 11:57:05 +02:00
Michael Niedermayer
3cab228005
Merge commit 'd6e4f5fef0d811e180fd7541941e07dca9e11dc0'
...
* commit 'd6e4f5fef0d811e180fd7541941e07dca9e11dc0':
arm: Add VFP-accelerated version of int32_to_float_fmul_array8
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-22 11:55:40 +02:00
Michael Niedermayer
1573274b91
Merge commit '26ffcc7de1d98f77400a2ebe4e75055515c54587'
...
* commit '26ffcc7de1d98f77400a2ebe4e75055515c54587':
dcadec: Use int32_to_float_fmul_array8
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-22 11:48:43 +02:00
Michael Niedermayer
0d3400ec53
Merge commit '31c6f6f65c0ed5a894e26ce44ab0c3e89c82b9a2'
...
* commit '31c6f6f65c0ed5a894e26ce44ab0c3e89c82b9a2':
fmtconvert: Add a new method, int32_to_float_fmul_array8
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-22 11:48:06 +02:00
Michael Niedermayer
877bbe05ce
Merge commit 'ce9ed10ac27b9cf32a6257e083ea2f052692d971'
...
* commit 'ce9ed10ac27b9cf32a6257e083ea2f052692d971':
arm: Add VFP-accelerated version of int32_to_float_fmul_scalar
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-22 11:42:19 +02:00
Michael Niedermayer
0129026c4e
Merge commit '41ef1d360bac65032aa32f6b43ae137666507ae5'
...
* commit '41ef1d360bac65032aa32f6b43ae137666507ae5':
arm: Add VFP-accelerated version of synth_filter_float
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-22 11:41:37 +02:00
Michael Niedermayer
b909428dab
Merge commit '4719040cd1b54381796b22056a9ae37bd2b4668d'
...
* commit '4719040cd1b54381796b22056a9ae37bd2b4668d':
libx264: Define X264_API_IMPORTS on MSVC/ICL
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-22 10:23:46 +02:00
Ben Avison
ff30d12159
arm: Add VFP-accelerated version of qmf_32_subbands
...
Before After
Mean StdDev Mean StdDev Change
This function 1323.0 98.0 746.2 60.6 +77.3%
Overall 15400.0 336.4 14147.5 288.4 +8.9%
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-07-22 10:15:44 +03:00
Ben Avison
800ffab48a
dcadsp: Add a new method, qmf_32_subbands
...
This does most of the work formerly carried out by
the static function qmf_32_subbands() in dcadec.c.
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-07-22 10:15:42 +03:00
Martin Storsjö
8b9eba664e
arm: Add VFP-accelerated version of fft16
...
Before After
Mean StdDev Mean StdDev Change
This function 1389.3 4.2 967.8 35.1 +43.6%
Overall 15577.5 83.2 15400.0 336.4 +1.2%
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-07-22 10:15:41 +03:00
Martin Storsjö
ba6836c966
arm: Add VFP-accelerated version of dca_lfe_fir
...
Before After
Mean StdDev Mean StdDev Change
This function 868.2 33.5 436.0 27.0 +99.1%
Overall 15973.0 223.2 15577.5 83.2 +2.5%
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-07-22 10:15:39 +03:00
Martin Storsjö
b63bb251ea
arm: Add VFP-accelerated version of imdct_half
...
Before After
Mean StdDev Mean StdDev Change
This function 2653.0 28.5 1108.8 51.4 +139.3%
Overall 17049.5 408.2 15973.0 223.2 +6.7%
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-07-22 10:15:37 +03:00
Ben Avison
d6e4f5fef0
arm: Add VFP-accelerated version of int32_to_float_fmul_array8
...
Before After
Mean StdDev Mean StdDev Change
This function 366.2 18.3 277.8 13.7 +31.9%
Overall 18420.5 489.1 17049.5 408.2 +8.0%
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-07-22 10:15:36 +03:00
Ben Avison
26ffcc7de1
dcadec: Use int32_to_float_fmul_array8
...
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-07-22 10:15:35 +03:00
Ben Avison
31c6f6f65c
fmtconvert: Add a new method, int32_to_float_fmul_array8
...
This is similar to int32_to_float_fmul_scalar, but
loads a new scalar multiplier every 8 input samples.
This enables the use of much larger input arrays, which
is important for pipelining on some CPUs (such as
ARMv6).
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-07-22 10:15:33 +03:00
Ben Avison
ce9ed10ac2
arm: Add VFP-accelerated version of int32_to_float_fmul_scalar
...
Before After
Mean StdDev Mean StdDev Change
This function 1175.0 4.4 366.2 18.3 +220.8%
Overall 19285.5 292.0 18420.5 489.1 +4.7%
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-07-22 10:15:30 +03:00
Ben Avison
41ef1d360b
arm: Add VFP-accelerated version of synth_filter_float
...
Before After
Mean StdDev Mean StdDev Change
This function 9295.0 114.9 4853.2 83.5 +91.5%
Overall 23699.8 397.6 19285.5 292.0 +22.9%
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-07-22 10:15:17 +03:00
Michael Niedermayer
682e8a694f
avcodec/h264_sei: Try to make code more robust by jumping to the specified SEI ends
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-22 02:48:13 +02:00
Justin Ruggles
8000206abc
libspeexdec: fix detection of final terminator code
2013-07-21 16:36:31 -04:00
Michael Niedermayer
118a1c2f4c
avcodec/ff_h264_decode_sei: use skip_bits_long()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-21 17:57:15 +02:00
Michael Niedermayer
45da7a0e8f
avcodec/ff_h264_decode_sei: Check SEI size
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-21 17:57:15 +02:00
Michael Niedermayer
80c873a87e
avcodec/ff_h264_decode_sei: fix integer overflow with size.
...
This issue is hypothetical and no testcase is available.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-21 17:57:15 +02:00
Michael Niedermayer
800ffa1fc0
avcodec/h264_sei/ff_h264_decode_sei: fix error codes for insufficient data
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-21 17:57:15 +02:00
Joakim Plate
8710a634a5
h264: add frame packing as stereo_mode frame metadata
...
This matches the matroska defintion of stereo_mode, with
no metadata written if no info exist in sei
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-21 16:04:02 +02:00
Derek Buitenhuis
4719040cd1
libx264: Define X264_API_IMPORTS on MSVC/ICL
...
libx264 has a few data exports which require X264_API_IMPORTS
to be defined if we link to libx264 dynamically on Windows.
In a similar fashion to how we handle our compat snprintf
implementation, if we define it all the time, the compiler
will first try and link to __imp_x264_symbol_name, and failing
that, as in the case of a static libx264, will attempt to link
to the non-prefixed symbol, which has already been pulled in by
other x264 functions' object files.
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2013-07-21 08:56:25 -04:00
Michael Niedermayer
0a28a52d53
Merge commit 'dd0bfc3a6a310e3e3674ce7742672d689a9a0e93'
...
* commit 'dd0bfc3a6a310e3e3674ce7742672d689a9a0e93':
dsicinav: Bound-check the source buffer when needed
Conflicts:
libavcodec/dsicinav.c
See: 47f0beadba
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-21 11:59:16 +02:00
Michael Niedermayer
75fbe41fc6
Merge commit 'fcae3ff124ee97c9265e3b93f3d41238b2aee9bd'
...
* commit 'fcae3ff124ee97c9265e3b93f3d41238b2aee9bd':
dsicinav: K&R formatting cosmetics
Conflicts:
libavcodec/dsicinav.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-21 11:45:48 +02:00
Michael Niedermayer
953c7550f8
avcodec/snowenc: convert speed relevant asserts to av_assert2()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-21 04:40:12 +02:00
Michael Niedermayer
7b79c84b40
avcodec/snowdec: remove assert.h include, its unused
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-21 04:36:32 +02:00
Michael Niedermayer
1434df3b93
jpeg2000dec: Support non subsampled 9-16bit planar pixel formats
...
This applies changes similar to fc6de70c44
to the >8bit codepath
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-21 04:16:53 +02:00
Luca Barbato
fd81899321
dsicinav: Clip the source size to the expected maximum
...
A packet larger than cin->bitmap_size does not make sense.
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
2013-07-19 22:14:07 +02:00
Luca Barbato
dd0bfc3a6a
dsicinav: Bound-check the source buffer when needed
...
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
2013-07-19 22:14:07 +02:00
Luca Barbato
fcae3ff124
dsicinav: K&R formatting cosmetics
2013-07-19 22:14:07 +02:00
Michael Niedermayer
db33010483
jpeg2000dec: silence unused variable warning
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-19 17:54:57 +02:00
Piotr Bandurski
5f39992ed9
bmp: fix decoding of flipped rle4
...
Fixes ticket #2794
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-19 17:42:34 +02:00
Michael Niedermayer
fc6de70c44
jpeg2000dec: Support non subsampled 8bit planar pixel formats
...
Fixes file2.jp2
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-18 21:50:32 +02:00
Michael Niedermayer
99de97cabf
jpeg2000dec: parse CDEF
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Conflicts:
libavcodec/jpeg2000dec.c
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-18 21:43:42 +02:00
Carl Eugen Hoyos
b39a6bbe7f
Fix pix_fmt detection in the native jpeg2000 decoder.
...
Based on b7a928b
by Michael Bradshaw.
Fixes ticket #2683 .
Reviewed-by: Nicolas Bertrand
2013-07-18 13:51:24 +02:00
Michael Niedermayer
9d01bf7d66
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
Consistently use "cpu_flags" as variable/parameter name for CPU flags
Conflicts:
libavcodec/x86/dsputil_init.c
libavcodec/x86/h264dsp_init.c
libavcodec/x86/hpeldsp_init.c
libavcodec/x86/motion_est.c
libavcodec/x86/mpegvideo.c
libavcodec/x86/proresdsp_init.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-18 09:53:47 +02:00
Diego Biurrun
3ac7fa81b2
Consistently use "cpu_flags" as variable/parameter name for CPU flags
2013-07-18 00:31:35 +02:00
Vignesh Venkatasubramanian
33968c201c
Fixing a stride issue in VP8 Alpha encode
...
When encoding alpha channel in libvpx, the stride isn't set
properly for the alpha encoder. Fixing it.
Signed-off-by: Vignesh Venkatasubramanian <vigneshv@google.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-17 13:38:26 +02:00
Michael Niedermayer
b4fe41c981
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
fmtconvert: Explicitly use int32_t instead of int
Conflicts:
libavcodec/ac3dec.c
libavcodec/fmtconvert.c
libavcodec/fmtconvert.h
See: f49564c607
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-17 10:48:56 +02:00
Michael Niedermayer
10336ca640
Merge commit '50612484e058e8b241f0528584d64d9d2ccebf12'
...
* commit '50612484e058e8b241f0528584d64d9d2ccebf12':
pthread: Rename thread_init to avoid symbol collision
Conflicts:
libavcodec/pthread.c
libavfilter/pthread.c
See: 674d8a9629
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-17 10:40:15 +02:00
Christophe Gisquet
b6293e2798
fmtconvert: Explicitly use int32_t instead of int
...
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-07-17 11:02:47 +03:00
Stefano Sabatini
53c853e049
lavc/h264_mp4toannexb: improve feedback in case of invalid bitstream
2013-07-17 01:17:32 +02:00
Michael Niedermayer
a80e622924
avcodec/avutil: Add AVColorSpace and AVColorRange to AVFrames
...
This also moves AVColorSpace and AVColorRange from avcodec to avutil
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-17 01:15:31 +02:00
Stefano Sabatini
0092bcdf06
lavc/avcodec.h: fix various typos in av_bitstream_filter_filter() docs
2013-07-17 00:51:43 +02:00
Sean McGovern
50612484e0
pthread: Rename thread_init to avoid symbol collision
...
The AIX threads library exposes a function with the same name.
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-07-17 00:13:31 +03:00
Michael Niedermayer
0b95f01140
Merge commit '8f24c12be7a3b3ea105e67bba9a867fe210a2333'
...
* commit '8f24c12be7a3b3ea105e67bba9a867fe210a2333':
ac3dec: Don't consume more data than the actual input packet size
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-15 23:42:58 +02:00
Martin Storsjö
8f24c12be7
ac3dec: Don't consume more data than the actual input packet size
...
This was handled properly in the normal return case at the end
of the function, but not in this special case.
Returning a value larger than the input packet size can cause
problems for certain library users.
Returning the actual input buffer size unconditionally, since
it is not guaranteed that frame_size is set to a sensible
value at this point.
Cc: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-07-15 21:37:21 +03:00
Alexis Ballier
69383d055e
ra144enc: set supported channel layouts.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-15 18:04:33 +02:00
Michael Niedermayer
fcbf16a76f
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
indeo: Reject impossible FRAMETYPE_NULL
Conflicts:
libavcodec/ivi_common.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-15 14:08:06 +02:00
Michael Niedermayer
c4b904caea
Merge commit 'f9e5261cab067be7278f73d515bc9b601eb56202'
...
* commit 'f9e5261cab067be7278f73d515bc9b601eb56202':
indeo: Do not reference mismatched tiles
Conflicts:
libavcodec/ivi_common.c
See: dab70c62d2
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-15 13:58:38 +02:00
Michael Niedermayer
8e4ecd8774
Merge commit '28dda8a691f1c723a4a9365ab85f9625f1330096'
...
* commit '28dda8a691f1c723a4a9365ab85f9625f1330096':
indeo: Sanitize ff_ivi_init_planes fail paths
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-15 13:45:36 +02:00
Michael Niedermayer
e3b13c1081
Merge commit 'b0eeb9d442e4b7e82f6797d74245434ea33110a5'
...
* commit 'b0eeb9d442e4b7e82f6797d74245434ea33110a5':
indeo5: return proper error codes
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-15 13:18:29 +02:00
Michael Niedermayer
1cd74a9b4d
Merge commit '25a6666f6c07c6ac8449a63d7fbce0dfd29c54cd'
...
* commit '25a6666f6c07c6ac8449a63d7fbce0dfd29c54cd':
indeo: Bound-check before applying motion compensation
The added checks and one previously added check are replaced by asserts,
the conditions can only be
true when vectors are invalid or there are worse inconsistencies.
We are checking the vectors validity and there should be no
inconsistencies, thus the checks should not be needed.
Also no files are known to cause any anomalies in ffmpeg
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-15 13:13:52 +02:00
Stefano Sabatini
4aa2874ab1
lavc/avcodec.h: extend documentation for AVPicture API
2013-07-15 12:24:47 +02:00
Luca Barbato
5b2a29552c
indeo: Reject impossible FRAMETYPE_NULL
...
A frame marked FRAMETYPE_NULL cannot be scalable and requires a
previous frame successfully decoded.
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
2013-07-15 11:46:50 +02:00
Luca Barbato
f9e5261cab
indeo: Do not reference mismatched tiles
...
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
2013-07-15 11:46:30 +02:00
Luca Barbato
28dda8a691
indeo: Sanitize ff_ivi_init_planes fail paths
...
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
2013-07-15 11:29:59 +02:00
Luca Barbato
b0eeb9d442
indeo5: return proper error codes
2013-07-15 11:29:59 +02:00
Luca Barbato
25a6666f6c
indeo: Bound-check before applying motion compensation
...
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
2013-07-15 11:29:59 +02:00
Michael Niedermayer
febbddbdd5
indeo4: print an error message if ref_mb is needed but unavailable
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-14 15:18:03 +02:00
Michael Niedermayer
76d0a6656b
indeo: print errors if transform and block size mismatch
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-14 14:20:42 +02:00
Michael Niedermayer
a8e5fac1fb
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
indeo: Bound-check before applying transform
Conflicts:
libavcodec/indeo4.c
libavcodec/indeo5.c
libavcodec/ivi_common.c
See: af38823709
, 0846719dd1
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-14 13:37:40 +02:00
Michael Niedermayer
ccb422a697
Merge commit 'cd78e934c246d1b2510f8fba0abfe40bb75795f6'
...
* commit 'cd78e934c246d1b2510f8fba0abfe40bb75795f6':
indeo4: Validate scantable dimension
See: 92f7f1db42
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-14 13:08:13 +02:00
Michael Niedermayer
8c0bb19522
Merge commit '6255ccf7d51c82ab79bf0cd47a921f572dda4489'
...
* commit '6255ccf7d51c82ab79bf0cd47a921f572dda4489':
indeo4: Check the quantization matrix index
Conflicts:
libavcodec/indeo4.c
See: 8a20774a24
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-14 12:43:45 +02:00
Michael Niedermayer
5462361937
Merge commit '8435bca087c0e79385763c51de009fd89390b6a5'
...
* commit '8435bca087c0e79385763c51de009fd89390b6a5':
indeo4: Do not access missing reference MV
Conflicts:
libavcodec/indeo4.c
See: 5216245a
, aae44fb4
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-14 12:38:54 +02:00
Michael Niedermayer
ac20ba35e3
Merge commit '031be5b41b54c3b666f31d83fe3ad41c194af8c5'
...
* commit '031be5b41b54c3b666f31d83fe3ad41c194af8c5':
ac3dec: Consistently use AC3_BLOCK_SIZE and sizeof
Conflicts:
libavcodec/ac3dec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-14 12:10:38 +02:00
Luca Barbato
dc79685195
indeo: Bound-check before applying transform
...
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
2013-07-13 19:11:18 +02:00
Luca Barbato
cd78e934c2
indeo4: Validate scantable dimension
...
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
2013-07-13 19:11:18 +02:00
Luca Barbato
6255ccf7d5
indeo4: Check the quantization matrix index
...
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
2013-07-13 19:11:18 +02:00
Luca Barbato
8435bca087
indeo4: Do not access missing reference MV
...
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
2013-07-13 19:11:18 +02:00
Martin Storsjö
031be5b41b
ac3dec: Consistently use AC3_BLOCK_SIZE and sizeof
...
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-07-13 19:06:52 +03:00
Martin Storsjö
68e57cde68
ac3dec: Increment channel pointers only once per channel
...
If the channel mapping map multiple output channels to one
input channel, we should only increment the actual pointer once.
Cc: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-07-13 18:55:07 +03:00
Nicolas Bertrand
886e1b36f5
jpeg2000: Remove unused passes array in Jpeg200Cblk structure
...
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2013-07-13 14:28:48 +02:00
Nicolas Bertrand
f56fe04de3
jpeg2000: Initialize only once mqc arrays
...
Improves decoding speed.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2013-07-13 07:54:12 +02:00
Carl Eugen Hoyos
8e3c5c70ca
g726: Do not try to decode more than one channel.
...
Ask for a sample instead.
Reviewed-by: Derek Buitenhuis
2013-07-13 17:16:30 +02:00
Michael Niedermayer
4cdb42b428
avcodec/012v: improve stride selection
...
Fixes decoding some files
Fixes Ticket2126
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-13 16:23:31 +02:00
Michael Niedermayer
f57119b8e5
jpeg2000: fix overflow in dequantization
...
Fixes decoding of file generated with:
ffmpeg -f lavfi -i smptehdbars=hd720 -pix_fmt rgb48 /tmp/o.jp2
Reviewed-by: Nicolas BERTRAND <nicoinattendu@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-13 12:44:37 +02:00
Nicolas Bertrand
dd1382ac95
jpeg2000: Initialize only once mqc arrays
...
Increases encoding and decoding speed
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-12 23:43:09 +02:00
Michael Niedermayer
8aea97a49d
avcodec/jpeglsdec: Implement the 4th (lossy) transform
...
Fixes remainder of Ticket893
Std deviation from the intended image is 0.11, max sample error +-1
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-12 17:52:03 +02:00
Michael Niedermayer
cce254373c
Merge commit '3802833bc1f79775a1547c5e427fed6e92b77e53'
...
* commit '3802833bc1f79775a1547c5e427fed6e92b77e53':
dca: Respect the current limits in the downmixing capabilities
Conflicts:
libavcodec/dcadec.c
See: 8e77c3846e
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-12 14:49:27 +02:00
Michael Niedermayer
107a56c1ed
Merge commit 'f261e508459e28beca59868a878e1519a44bb678'
...
* commit 'f261e508459e28beca59868a878e1519a44bb678':
dca: Error out on missing DSYNC
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-12 14:13:22 +02:00
Michael Niedermayer
73f940e4d9
Merge commit 'c82da343e635663605bd81c59d872bee3182da73'
...
* commit 'c82da343e635663605bd81c59d872bee3182da73':
pcm: always use codec->id instead of codec_id
This is not merged as we consistently use codec_id, while libav against what
the comit message might hint at mixes both in the decoder.
Its fine to use either but it should be consistent.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-12 14:08:32 +02:00
Michael Niedermayer
0da0caa9a9
Merge commit 'c0d973c41b4568d5bad1295879e35cfa611bdcf2'
...
* commit 'c0d973c41b4568d5bad1295879e35cfa611bdcf2':
vdpau: use the correct namespace for the union
Conflicts:
libavcodec/vdpau.h
See: 68dfe530e0
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-12 13:47:37 +02:00
Michael Niedermayer
e9348e107b
Merge commit 'e9d394f3fad7e8fd8fc80e3b33cb045bbaceb446'
...
* commit 'e9d394f3fad7e8fd8fc80e3b33cb045bbaceb446':
mlpdec: Do not set invalid context in read_restart_header
Conflicts:
libavcodec/mlpdec.c
See: a9cd12ee2a
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-12 13:28:40 +02:00
Michael Niedermayer
9d47333e3e
Merge commit '2b379a925162b6783bd9a81dc03e647e8b65494c'
...
* commit '2b379a925162b6783bd9a81dc03e647e8b65494c':
mlpdsp: x86: Respect cpuflags
Conflicts:
libavcodec/x86/mlpdsp.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-12 13:10:53 +02:00
Michael Niedermayer
50617fce07
Merge commit '3abde1a3b49cf299f2aae4eaae6b6cb5270bdc22'
...
* commit '3abde1a3b49cf299f2aae4eaae6b6cb5270bdc22':
pcx: Do not overread source buffer in pcx_rle_decode
Conflicts:
libavcodec/pcx.c
See: 8cd1c0febe
Bytestream based system is left in place and not switched to buf+end, such switch would be
a step backward
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-12 12:58:13 +02:00
Michael Niedermayer
54bbb90568
Merge commit '170fb593c617cd797d00cf05bfb8d8c21d612893'
...
* commit '170fb593c617cd797d00cf05bfb8d8c21d612893':
pcx: K&R formatting cosmetics
Conflicts:
libavcodec/pcx.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-12 12:36:04 +02:00
Luca Barbato
3802833bc1
dca: Respect the current limits in the downmixing capabilities
...
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
2013-07-12 04:34:49 +02:00
Luca Barbato
f261e50845
dca: Error out on missing DSYNC
...
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
2013-07-12 04:34:49 +02:00
Luca Barbato
c82da343e6
pcm: always use codec->id instead of codec_id
...
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
2013-07-12 04:34:49 +02:00
Luca Barbato
c0d973c41b
vdpau: use the correct namespace for the union
...
Vdp is used by libvdpau, use AVVDPAU as used for the rest.
Reported-by: Alexis Ballier <aballier@gentoo.org>
2013-07-12 04:34:49 +02:00
Luca Barbato
e9d394f3fa
mlpdec: Do not set invalid context in read_restart_header
...
The faulty values rippled further down the codepath causing a
hard-to-track segfault in the assembly code.
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
2013-07-12 04:34:49 +02:00
Luca Barbato
2b379a9251
mlpdsp: x86: Respect cpuflags
2013-07-12 04:34:49 +02:00
Luca Barbato
3abde1a3b4
pcx: Do not overread source buffer in pcx_rle_decode
...
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
2013-07-12 04:34:49 +02:00
Luca Barbato
170fb593c6
pcx: K&R formatting cosmetics
2013-07-12 04:34:49 +02:00
Michael Niedermayer
0ef40446a8
mjpegdec: print length too in APPx debug code
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-11 16:28:55 +02:00
Michael Niedermayer
8024b4880c
avcodec/jpeglsdec: support xfrm 1-3
...
Fixes 75% of Ticket893
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-11 16:10:18 +02:00
Michael Niedermayer
96747e6cbe
mjpegdec: parse app-xfrm
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-11 16:08:49 +02:00
Michael Niedermayer
7afa68d37d
mjpegdec: parse app-colr
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-11 16:08:36 +02:00
Michael Niedermayer
531f016944
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
wmavoice: conceal clearly corrupted blocks
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-11 11:50:18 +02:00
Michael Niedermayer
45cc62f0a0
Merge commit 'f5c48f5adaead5259660d4eaab2e695d1bac3a08'
...
* commit 'f5c48f5adaead5259660d4eaab2e695d1bac3a08':
wmavoice: use init_static_data
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-11 11:41:34 +02:00
Michael Niedermayer
5698f6bd73
Merge commit '04e9853a210e07b1a150aa2b8e9af0aa3601ff21'
...
* commit '04e9853a210e07b1a150aa2b8e9af0aa3601ff21':
wmavoice: return meaningful error codes
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-11 11:33:19 +02:00
Michael Niedermayer
56090b5b80
Merge commit '3865ba7b21aef5d60183719e238361ec8797ab5a'
...
* commit '3865ba7b21aef5d60183719e238361ec8797ab5a':
iff: K&R formatting cosmetics
Conflicts:
libavcodec/iff.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-11 11:12:48 +02:00
Michael Niedermayer
15cee5e562
mjpegdec: Fix used quant index for gbr
...
Fixes Ticket1651
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-11 02:31:58 +02:00
Michael Niedermayer
94e86ae15a
mjpegdec: initialize source variables before gbr remap
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-11 02:31:58 +02:00
Paul B Mahol
4511973901
wmalosslessdec: do not set avctx->coded_frame
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-07-10 19:11:12 +00:00
Michael Niedermayer
8f09957194
avcodec/qdm2: initialize sign_bits
...
Fixes non deterministic output
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-10 16:21:33 +02:00
Michael Niedermayer
fbe159e850
avcodec/qdm2: store bits in an integer instead of float variable
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-10 16:18:52 +02:00
Michael Niedermayer
2e6338b472
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
qdm2: Conceal broken samples
See: 5ee008e01d
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-10 16:00:57 +02:00
Luca Barbato
d14a26edb7
wmavoice: conceal clearly corrupted blocks
...
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
2013-07-10 15:50:06 +02:00
Luca Barbato
f5c48f5ada
wmavoice: use init_static_data
2013-07-10 15:49:58 +02:00
Luca Barbato
04e9853a21
wmavoice: return meaningful error codes
2013-07-10 15:49:51 +02:00
Luca Barbato
7d65e960c7
iff: Do not read over the source buffer
...
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
2013-07-10 15:24:42 +02:00
Luca Barbato
3865ba7b21
iff: K&R formatting cosmetics
2013-07-10 15:23:51 +02:00
Michael Niedermayer
564909093a
Merge commit 'adadc3f2443d25b375e21e801516ccfd78e0b080'
...
* commit 'adadc3f2443d25b375e21e801516ccfd78e0b080':
qdm2: refactor joined stereo support
Conflicts:
libavcodec/qdm2.c
See: 2b12d1ffd8
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-10 15:07:20 +02:00
Paul B Mahol
8491f40500
tak: use crc table from lavu
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-07-10 12:07:53 +00:00
Michael Niedermayer
a3d9a21683
Merge commit 'bbf6a4aa20bfe3d7869b2218e66063602dfb8aa7'
...
* commit 'bbf6a4aa20bfe3d7869b2218e66063602dfb8aa7':
imc: Catch a division by zero
atrac3: Error on impossible encoding/channel combinations
See: 13451f5520
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-10 12:28:07 +02:00
Luca Barbato
5eaed6d336
atrac3: fix error handling
...
decode_tonal_components returns a proper AVERROR.
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-10 02:15:43 +02:00
Alexis Ballier
c3ca70204b
codec_desc: fix typo in rv20 long_name.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-10 00:27:34 +02:00
Michael Niedermayer
233177a4ec
jpegdec: clear EOBRUN on restarts
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-09 23:49:06 +02:00
Michael Niedermayer
1c032e94d0
jpegdec: give handle_rstn() a return code that indicates if restart did happen
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-09 23:45:31 +02:00
Michael Niedermayer
776155ca29
mjpeg_decode_scan: reset restart state
...
Fixes Ticket2082
Fixes progressive/refinement + restart jpegs
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-09 23:43:36 +02:00
Michael Niedermayer
325411a687
snowenc: check minimum resolution
...
Fixes Ticket1855
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-09 21:10:45 +02:00
Piotr Bandurski
aa74810fc6
bitstream: fix a crash in case of oom
...
fixes ticket #2766
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-09 19:41:22 +02:00
Luca Barbato
87fb18c3e4
imc: Catch a division by zero
...
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Reviewed-by: Kostya Shishkov
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-09 16:20:50 +02:00
Luca Barbato
4ecdb5ed44
qdm2: Conceal broken samples
...
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
2013-07-09 15:57:46 +02:00
Luca Barbato
adadc3f244
qdm2: refactor joined stereo support
...
qdm2 does support only two channels. Loop over the run once.
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
2013-07-09 15:57:32 +02:00
Michael Niedermayer
7d9cb12689
avcodec/wmaprodec: Check block_align
...
Fixes undefined behavior
Its not known if this condition can be triggered through crafted input.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-09 15:32:21 +02:00
Michael Niedermayer
0dd99628ea
ff_lpc_calc_coefs: assert that the type is levinson or cholesky
...
Otherwise the code could misbehave (and there are no other types anyway)
Fixes CID700759
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-09 11:57:45 +02:00
Luca Barbato
bbf6a4aa20
imc: Catch a division by zero
...
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
2013-07-09 10:49:29 +02:00
Luca Barbato
12576afe20
adpcm: Write the correct number of samples for ima-dk4
...
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
2013-07-09 10:49:29 +02:00
Luca Barbato
50cf5a7fb7
atrac3: Error on impossible encoding/channel combinations
...
Joint stereo encoded mono is impossible.
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
2013-07-09 10:49:29 +02:00
Luca Barbato
22e76ec635
atrac3: set the getbits context the right buffer_end
...
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
2013-07-09 10:49:29 +02:00
Luca Barbato
874c8a17ac
atrac3: fix error handling
...
decode_tonal_components returns a proper AVERROR.
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
2013-07-09 10:49:29 +02:00
Michael Niedermayer
00b1401df6
avcodec/h264_ps: try to support Ambarella AVC
...
Fixes Ticket2763
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-09 05:21:26 +02:00
Michael Niedermayer
a20f049c2a
avcodec/libvpxenc: make class names unique
...
This should fix an infinite loop with -h full
Found-by: <Foofie>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-09 03:04:31 +02:00
Michael Niedermayer
970c8df735
mpeg12dec: avoid reinitializtation on PS changes when possible.
...
Fixes Ticket2574
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-08 21:55:04 +02:00
Carl Eugen Hoyos
b86651a208
Check the return value of ff_rv34_decode_init() in rv30.c and rv40.c
...
Avoids possible null pointer dereferences on oom.
Fixes ticket #2727 .
2013-07-08 11:56:16 +02:00
Michael Niedermayer
44d0e520f8
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
qdm2: check and reset dithering index per channel
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-08 05:26:17 +02:00
Michael Niedermayer
e1f98f2231
Merge commit '76efedeadb1f6bf79020c44a71dd0cee13d932ad'
...
* commit '76efedeadb1f6bf79020c44a71dd0cee13d932ad':
qdm2: formatting cosmetics
Conflicts:
libavcodec/qdm2.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-08 05:10:06 +02:00
Michael Niedermayer
d28a8ad8f3
Merge commit 'f054e309c58894450a5d18cce9799ef58aab9f14'
...
* commit 'f054e309c58894450a5d18cce9799ef58aab9f14':
qdm2: use init_static_data
westwood_vqa: do not free extradata on error in read_header
Conflicts:
libavformat/westwood_vqa.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-08 05:02:52 +02:00
Michael Niedermayer
b5a87dc193
Merge commit 'c4abc9098cacb227dba39bac6aea16b2bceba0d0'
...
* commit 'c4abc9098cacb227dba39bac6aea16b2bceba0d0':
vqavideo: check the version
Conflicts:
libavcodec/vqavideo.c
See: b226af3910
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-08 04:53:52 +02:00
Paul B Mahol
099e57bc38
zmbvenc: remove unused AVFrame from encoder private context
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-07-07 23:50:54 +00:00
Paul B Mahol
3bec6a44ea
zmbvenc: do not set avctx->coded_frame
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-07-07 23:45:17 +00:00
Paul B Mahol
ec4e042f33
gif: remove unused AVFrame from encoder private context
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-07-07 23:06:06 +00:00
Paul B Mahol
bd03f99d05
gif: do not set avctx->coded_frame
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-07-07 22:57:17 +00:00
Luca Barbato
744a11c996
qdm2: check and reset dithering index per channel
...
Checking per subband would have the index exceed the
dithering noise table size.
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
2013-07-07 22:06:35 +02:00
Luca Barbato
76efedeadb
qdm2: formatting cosmetics
...
Apply the usual style plus drop few unnecessary return at the end
of void functions.
2013-07-07 22:06:28 +02:00
Luca Barbato
f054e309c5
qdm2: use init_static_data
2013-07-07 22:06:20 +02:00
Luca Barbato
c4abc9098c
vqavideo: check the version
...
Prevent out of buffer write.
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
2013-07-07 22:04:05 +02:00
Ronald S. Bultje
46d208e1e0
vp8: Wait for prev_frame to parse segment_map before reading it
...
This fixes occasional failures of vp8-test-vector-010 with frame-level
multithreading enabled.
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-07-07 13:30:29 +03:00
Paul B Mahol
19436308b4
dxa: make code independent of sizeof(AVFrame)
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-07-06 16:33:59 +00:00
Michael Niedermayer
2adf8a9c09
Merge commit '4e7f0b082d8c4b360312216b9241bec65ff63b35'
...
* commit '4e7f0b082d8c4b360312216b9241bec65ff63b35':
kmvc: Clip pixel position to valid range
The added clip should make no difference, there are already checks for
the index.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-07 11:17:53 +02:00
Michael Niedermayer
1aeddc3cbf
Merge commit '8f689770548c86151071ef976cf9b6998ba21c2a'
...
* commit '8f689770548c86151071ef976cf9b6998ba21c2a':
kmvc: use fixed sized arrays in the context
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-07 10:54:39 +02:00
Michael Niedermayer
104dfaadaa
dct_unquantize_h263_intra_c: fix assert condition
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-07 01:50:59 +02:00
Michael Niedermayer
707b2135fd
libavcodec/x86/mpegvideo: Move mmx functions under HAVE_MMX_INLINE
...
should fix ticket2755
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-07 01:50:59 +02:00
Michael Niedermayer
abce6dfd9e
avcodec/x86/vp3dsp_init: move mmx functions under HAVE_MMX_INLINE
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-07 01:50:59 +02:00
Luca Barbato
4e7f0b082d
kmvc: Clip pixel position to valid range
...
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
2013-07-06 14:12:45 +02:00
Luca Barbato
8f68977054
kmvc: use fixed sized arrays in the context
...
Avoid some boilerplate code to dynamically allocate and then free the
buffers.
2013-07-06 14:12:42 +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
66537c7efd
avcodec/x86/cabac: Disable get_cabac_bypass_x86() on broken llvm/clang
...
This should fix fate on these platforms
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-06 16:24:27 +02:00
Michael Niedermayer
32de28053d
avcodec/x86/cabac: factorize broken llvm/clang check out
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-06 16:24:27 +02:00
Michael Niedermayer
98277fd1a0
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
bitstream_filter: K&R formatting cosmetics
Conflicts:
libavcodec/bitstream_filter.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-06 12:08:43 +02:00