Michael Niedermayer
eee19198ef
avcodec/libfaac: fallback to a supported bitrate if the requested is not supported
...
Fixes: Ticket2587
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-23 15:37:48 +02:00
Michael Niedermayer
ef43b9496b
avcodec/mpegvideo: remove empty comments
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-23 14:43:42 +02:00
Darryl Wallace
3e16047507
s302m encoder
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-05-23 12:03:06 +00:00
Paul B Mahol
fbd0f91a3a
escape130: switch to init_get_bits8()
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-05-23 10:21:12 +00:00
Michael Niedermayer
ac2c52174f
avcodec/wavpack: remove ;;
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-23 12:07:31 +02:00
Paul B Mahol
79f452f4e6
fraps: set avctx->color_range
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-05-23 10:05:28 +00:00
Michael Niedermayer
b7d16dc4bd
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
wavpack: check packet size early
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-23 10:55:46 +02:00
Michael Niedermayer
402bec52d4
Merge commit '3f0b6d7a6248a33df37b98cfcb37a1acce263f62'
...
* commit '3f0b6d7a6248a33df37b98cfcb37a1acce263f62':
wavpack: use bytestream2 in wavpack_decode_block
Conflicts:
libavcodec/wavpack.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-23 10:46:05 +02:00
Michael Niedermayer
1724123c65
Merge commit '3eae9b030cbbdc263f69834b791624613032d548'
...
* commit '3eae9b030cbbdc263f69834b791624613032d548':
mpegvideo: unref buffers in ff_mpeg_unref_picture on frame size changes
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-23 10:25:25 +02:00
Luca Barbato
fd06291239
wavpack: check packet size early
...
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
2013-05-22 22:02:57 +02:00
Luca Barbato
3f0b6d7a62
wavpack: use bytestream2 in wavpack_decode_block
...
Prevent most out of buffer reads.
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
2013-05-22 22:02:55 +02:00
Michael Niedermayer
657875b145
avcodec/aic: Fix vlc value checks
...
Fixes out of array accesses
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-22 21:30:28 +02:00
Michael Niedermayer
30df9789a9
proresdec: Fix end condition
...
Fixes out of array writes
No FFmpeg release is affected by this
This also fixes some artifacts
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-22 20:24:50 +02:00
Michael Niedermayer
df3ee7b9a9
smvjpegdec: use av_pix_fmt_desc_get() avoid direct table access
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-22 20:24:50 +02:00
Michael Niedermayer
ad22767cb6
shorten: fix "off by padding" bug
...
Fixes array overread
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-22 17:40:12 +02:00
Janne Grunau
3eae9b030c
mpegvideo: unref buffers in ff_mpeg_unref_picture on frame size changes
...
ff_mpeg_unref_picture clears the flag indicating that the frame needs to
be reallocated after a frame size change. Since we have now reference
counted buffers we can unref the buffers immediately.
2013-05-22 15:40:12 +02:00
Ash Hughes
14ec9d2590
Support playing SMV files.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-22 15:20:22 +02:00
Michael Niedermayer
914ab4cd1c
j2kdec & jpeg2000dec: check lengthinc against array size
...
Fixes out of array reads
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-22 04:18:38 +02:00
Michael Niedermayer
17e66c9ff4
j2k & jpeg2000dec: reset numX/Ytiles if tiles failed allocation
...
Fixes null pointer dereference
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-22 03:18:55 +02:00
Michael Niedermayer
53f0442464
avcodec/jpeg2000dec: Port tile size check from j2kdec
...
Fixes potential integer overflow
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-22 03:16:52 +02:00
Michael Niedermayer
73ffab4195
jpeg2000dec: check TPsot
...
Fixes out of array accesses
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-22 02:53:21 +02:00
Michael Niedermayer
fec8783883
jpeg2000dec: read and check curtileno
...
Fixes out of array accesses
Code ported from j2kdec
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-22 02:29:49 +02:00
Michael Niedermayer
f399b33c2b
jpeg2000dec & j2kdec: Fix return type of get_sot()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-22 02:14:04 +02:00
Michael Niedermayer
4a9a6a1f35
vcodec/jpeg2000dec: fix av_log() type
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-22 02:05:50 +02:00
Michael Niedermayer
8d9fa738f5
j2kdec: cosmetics from jpeg2000dec
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-22 01:25:52 +02:00
Michael Niedermayer
0b42631641
avcodec/jpeg2000dec: merge bytestream2 reading from j2kdec
...
This fixes at least one out of array access
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-22 01:24:47 +02:00
Michael Niedermayer
c649ecb3b2
avcodec/jpeg2000dec: get_qcx, fix stack and heap overwrites
...
This is likely remotely exploitable
Fix ported from j2kdec
No uptodate FFmpeg release should be affected by this
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-22 00:07:45 +02:00
Michael Niedermayer
069ede2981
jpeg2000dec: Check ncomponents and tile dimensions
...
Fixes various problems
Code ported from j2kdec
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-21 21:44:34 +02:00
Michael Niedermayer
78c7bff04a
avcodec/j2k: rename J2K_ constants to JPEG2000_
...
This should simplify merging the 2 decoders
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-21 21:44:34 +02:00
Michael Niedermayer
0ab0ed2b86
j2k: Rename structs to be more similar to jpeg2000dec
...
This should simplify merging
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-21 21:44:34 +02:00
Michael Niedermayer
376e89e280
j2kdec: s/decode_packets/jpeg2000_decode_packets/
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-21 21:44:34 +02:00
Paul B Mahol
dbb49a6539
vp3: zero allocated tables
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-05-21 17:49:29 +00:00
Michael Niedermayer
b1bbd715d8
avcodec/huffman: increase bits constant
...
Fixes Ticket2593
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-21 13:51:04 +02:00
Michael Niedermayer
b9ea6a8414
avcodec/huffman: use named identifer for the bits constant
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-21 13:51:04 +02:00
Michael Niedermayer
1d7e6a6bde
avcodec/bitstream: print vlc length in error case.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-21 13:51:04 +02:00
Michael Niedermayer
b60a65ee2d
mjpegdec: fix AV_PIX_FMT_YUVJ411P handling
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-21 12:56:12 +02:00
Michael Niedermayer
a90baa63c3
add YUVJ411P
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-21 12:56:11 +02:00
Michael Niedermayer
1d8b1f0e51
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
proresdec: simplify slice component offsets handling
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-21 12:01:58 +02:00
Michael Niedermayer
6ef7b6af6b
Merge commit 'cfbd98abe82cfcb9984a18d08697251b72b110c8'
...
* commit 'cfbd98abe82cfcb9984a18d08697251b72b110c8':
mjpegdec: validate parameters in mjpeg_decode_scan_progressive_ac
Conflicts:
libavcodec/mjpegdec.c
See: 1f41cffe1e
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-21 12:01:37 +02:00
Michael Niedermayer
3b071a4390
Merge commit 'a030279a67ef883df8cf3707774656fa1be81078'
...
* commit 'a030279a67ef883df8cf3707774656fa1be81078':
ljpeg: use the correct number of components in yuv
Conflicts:
libavcodec/mjpegdec.c
See: b2e57eb5a3
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-21 11:25:46 +02:00
Michael Niedermayer
f57a7ac9b8
Merge commit '8aa3500905fec6c4e657bb291b861d43c34d3de9'
...
* commit '8aa3500905fec6c4e657bb291b861d43c34d3de9':
mjpeg: Validate sampling factors
Conflicts:
libavcodec/mjpegdec.c
See: 08c37a10e9
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-21 10:50:03 +02:00
Kostya Shishkov
03ece7b040
proresdec: simplify slice component offsets handling
2013-05-21 09:58:59 +02:00
Luca Barbato
cfbd98abe8
mjpegdec: validate parameters in mjpeg_decode_scan_progressive_ac
...
Prevent out of buffer write when decoding broken samples.
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
2013-05-21 09:46:02 +02:00
Luca Barbato
a030279a67
ljpeg: use the correct number of components in yuv
...
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
2013-05-20 22:02:05 +02:00
Luca Barbato
8aa3500905
mjpeg: Validate sampling factors
...
They must be non-zero.
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
2013-05-20 22:02:05 +02:00
Michael Niedermayer
2211c76287
smacker: remove av_clip_int16()
...
Fixes Ticket2425
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-20 21:45:40 +02:00
Michael Niedermayer
2187600f47
libx264: silence: warning: the address of val will always evaluate as true
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-20 16:39:00 +02:00
Michael Niedermayer
f099cdaba3
avcodec/ratecontrol: silence "warning: expected_bits may be used uninitialized in this function"
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-20 15:49:49 +02:00
Michael Niedermayer
d61681f9e9
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
mpegvideo: unref old current_picture before allocating a new one
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-20 12:07:17 +02:00
Michael Niedermayer
c5e11e897a
Merge commit 'db347280eb3746d7b70888db97f1efe5f06f5624'
...
* commit 'db347280eb3746d7b70888db97f1efe5f06f5624':
vorbis: fallback to normal division instead of crashing
Conflicts:
libavcodec/vorbisdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-20 12:02:18 +02:00
Michael Niedermayer
ed113d7a6b
Merge commit 'ddf1b4a2f8a680126eb611428e4f47e6e5b8c6c0'
...
* commit 'ddf1b4a2f8a680126eb611428e4f47e6e5b8c6c0':
vorbis: simplify the inner loop in setup_classifs
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-20 11:42:03 +02:00
Michael Niedermayer
aef044d215
Merge commit '36f10380043c8b8c5cbf8c1add8695089cdaa341'
...
* commit '36f10380043c8b8c5cbf8c1add8695089cdaa341':
vorbis: use normal integer values for iterators
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-20 11:28:21 +02:00
Michael Niedermayer
fbba76e89d
Merge commit '98186578a2a21af5bfe6dd71d222dc270f763c7d'
...
* commit '98186578a2a21af5bfe6dd71d222dc270f763c7d':
vorbis: refactor vorbis_residue_decode_internal
Conflicts:
libavcodec/vorbisdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-20 10:58:43 +02:00
Michael Niedermayer
faac955d9b
Merge commit 'c360fb174b01170ab3fd3048d4d0acb44aa4e834'
...
* commit 'c360fb174b01170ab3fd3048d4d0acb44aa4e834':
win32: Do not use GetProcAddress when compiled for Vista+
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-20 10:52:19 +02:00
Janne Grunau
4b79668154
mpegvideo: unref old current_picture before allocating a new one
...
Allows decoding with only three frame buffers with frame reference
counting. Fixes VAAPI based decoding in vlc which uses only three
frame buffers for the mpegvideo-based codecs.
2013-05-19 23:02:35 +02:00
Luca Barbato
db347280eb
vorbis: fallback to normal division instead of crashing
...
The use of ff_inverse speeds up slightly arches + compilers that
do not provide a division faster than the whole machinery, such
as ppc32 + gcc4.7, but has operational limits.
Drop the always-enable assert and provide a fallback.
2013-05-19 22:56:37 +02:00
Luca Barbato
ddf1b4a2f8
vorbis: simplify the inner loop in setup_classifs
2013-05-19 22:56:37 +02:00
Luca Barbato
36f1038004
vorbis: use normal integer values for iterators
...
No need to use fixed-size integers.
2013-05-19 22:56:37 +02:00
Luca Barbato
98186578a2
vorbis: refactor vorbis_residue_decode_internal
2013-05-19 22:56:37 +02:00
Michael Niedermayer
73b9f31c74
mjpeg_decode_com: remove redundant len checks
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-19 18:09:57 +02:00
Piotr Bandurski
2f75dcdc1c
mjpegdec: Fix field orderforinterlacedAVDJand AVRN in ntsc mode
...
Fixes ticket1656
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-19 18:09:57 +02:00
Jean-Baptiste Kempf
c360fb174b
win32: Do not use GetProcAddress when compiled for Vista+
...
Instead link directly to the condition variable functions.
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-05-19 18:22:39 +03:00
Michael Niedermayer
a3264b4ba1
ffv1dec: defuse membomb
...
Fixes Ticket2589
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-19 13:56:13 +02:00
Michael Niedermayer
3e3514bce2
Merge commit 'ed50673066956d6f2201a57c3254569f2ab08d9d'
...
* commit 'ed50673066956d6f2201a57c3254569f2ab08d9d':
wavpack: validate samples size parsed in wavpack_decode_block
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-19 10:38:08 +02:00
Michael Niedermayer
2ad415cfa4
Merge commit '8c34558131d846d2b10389564caadaa206372fd4'
...
* commit '8c34558131d846d2b10389564caadaa206372fd4':
wavpack: return meaningful errors
Conflicts:
libavcodec/wavpack.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-19 10:22:05 +02:00
Michael Niedermayer
02788d2ac5
Merge commit '0f689a3d97a1d3053ca0e9516b296909a72ff31e'
...
* commit '0f689a3d97a1d3053ca0e9516b296909a72ff31e':
wavpack: K&R formatting cosmetics
Conflicts:
libavcodec/wavpack.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-19 10:10:00 +02:00
Carl Eugen Hoyos
e32bbd4112
proresdec2: Only try to decode alpha plane if four output planes were allocated.
...
Fixes a crash with MPlayer.
2013-05-19 01:48:39 +02:00
Luca Barbato
ed50673066
wavpack: validate samples size parsed in wavpack_decode_block
...
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
2013-05-18 20:39:32 +02:00
Luca Barbato
8c34558131
wavpack: return meaningful errors
...
And forward those that were already meaningful.
2013-05-18 20:37:18 +02:00
Christophe Gisquet
f49564c607
fmtconvert: int32_t input to int32_to_float_fmul_scalar
...
It was previously declared as int.
Does not change fate results for x86.
Conflicts:
libavcodec/ppc/fmtconvert_altivec.c
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-18 18:01:16 +02:00
Luca Barbato
0f689a3d97
wavpack: K&R formatting cosmetics
...
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2013-05-18 17:19:43 +02:00
Kostya Shishkov
d13fa0e995
proresdec2: Support decoding transparency information.
...
Signed-off-by: Carl Eugen Hoyos <cehoyos@ag.or.at>
2013-05-18 16:48:34 +02:00
Michael Niedermayer
5e29e91232
avcodec_align_dimensions2: add missing yuva formats
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-18 16:21:09 +02:00
Michael Niedermayer
ed0aed09e8
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
Escape 130 (RPL) decoder
Conflicts:
libavcodec/Makefile
libavcodec/allcodecs.c
libavcodec/codec_desc.c
libavcodec/escape130.c
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-18 14:31:01 +02:00
Michael Niedermayer
849bb62c2c
Merge commit 'cebdedca57d95834a8f8098c7b6a322a1163e26b'
...
* commit 'cebdedca57d95834a8f8098c7b6a322a1163e26b':
prores: decode alpha plane when it's present
avfilter: check a malloc in avfilter_link().
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-18 13:41:47 +02:00
Michael Niedermayer
20f75a810c
Merge commit '006ec64877fb638de4b15ae5fd969e22bd0f60ca'
...
* commit '006ec64877fb638de4b15ae5fd969e22bd0f60ca':
lavr doxy: add version.h to the lavr group
lavc doxy: add avcodec.h to the libavcodec group.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-18 11:25:58 +02:00
Michael Niedermayer
0718f0cc24
Merge commit 'bc8c1cdc7bfe7b1fe56df812aabdac3de2555cec'
...
* commit 'bc8c1cdc7bfe7b1fe56df812aabdac3de2555cec':
lavfi doxy: add a page for lavfi.
jpegls: check the scan offset
Conflicts:
libavcodec/jpeglsdec.c
libavfilter/avfilter.h
libavutil/avutil.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-18 11:04:11 +02:00
Michael Niedermayer
7d84bb2bcc
Merge commit '4a4107b48944397c914aa39ee16a82fe44db8c4c'
...
* commit '4a4107b48944397c914aa39ee16a82fe44db8c4c':
jpegls: factorize return paths
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-18 10:22:39 +02:00
Michael Niedermayer
b53d6a47c5
Merge commit 'a5a0ef5e13a59ff53318a45d77c5624b23229c6f'
...
* commit 'a5a0ef5e13a59ff53318a45d77c5624b23229c6f':
jpegls: return meaningful errors
sparc: VIS mnemonics
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-18 10:05:00 +02:00
Eli Friedman
350914fc80
Escape 130 (RPL) decoder
...
Some fixes provided by Paul B Mahol <onemda@gmail.com>
and Michael Niedermayer <michaelni@gmx.at> and me.
Signed-off-by: Diego Biurrun <diego@biurrun.de>
Signed-off-by: Kostya Shishkov <kostya.shishkov@gmail.com>
2013-05-18 07:12:56 +02:00
Kostya Shishkov
cebdedca57
prores: decode alpha plane when it's present
2013-05-18 07:11:34 +02:00
Anton Khirnov
f0cebf51dd
lavc doxy: add avcodec.h to the libavcodec group.
2013-05-17 20:27:38 +02:00
Luca Barbato
4a4107b489
jpegls: factorize return paths
2013-05-17 16:44:13 +02:00
Luca Barbato
a5a0ef5e13
jpegls: return meaningful errors
2013-05-17 16:44:13 +02:00
Luca Barbato
abad374909
jpegls: check the scan offset
...
Prevent an out of array bound write.
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
2013-05-17 16:44:13 +02:00
Michael Kostylev
2768f7e4fe
sparc: VIS mnemonics
...
Currently, if VIS is enabled by configure, it will also be enabled at
run-time regardless of its support in the hardware. Thus, masking VIS
usage as it is done in vis.h by constructing binary instructions is
pointless. Using normal VIS mnemonics in inline assembly allows to take
advantage of automatic register allocation, gets rid of register
variables, which are unsupported by suncc for SPARC, and improves code
readability.
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2013-05-17 15:37:03 +02:00
Michael Niedermayer
ebe8c7fe52
vc1dec: restructure interpmvp code
...
This fixes a valgrind warning about use of uninitialized stuff
(no actual such use occurs though)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-17 15:11:47 +02:00
Vignesh Venkatasubramanian
98c292a7a8
Adding support for encoding VP8 Alpha
...
This patch adds support for encoding VP8 files with alpha. The alpha channel
is encoded separately and the output is placed in AVPacket's side_data. The
muxer then muxes it into the BlockAdditional element of the matroska container.
More details on spec here: http://goo.gl/wCP1y
Signed-off-by: Vignesh Venkatasubramanian <vigneshv@google.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-17 15:11:23 +02:00
Michael Niedermayer
1a0057dc88
Merge commit 'db8e336e5fc18c41cb4e9bab1960349e9800d546'
...
* commit 'db8e336e5fc18c41cb4e9bab1960349e9800d546':
pthread: reindent
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-17 11:55:40 +02:00
Michael Niedermayer
36d349034e
Merge commit '30e256430eb88c6d4c382581b89bca171d79fbc0'
...
* commit '30e256430eb88c6d4c382581b89bca171d79fbc0':
lavc/pthread: remove obsolete checks
Conflicts:
libavcodec/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-17 11:49:00 +02:00
Michael Niedermayer
5bc892cb17
Merge commit '1232a1647ab27e024a3baf4d01d40c8d08d6ced9'
...
* commit '1232a1647ab27e024a3baf4d01d40c8d08d6ced9':
Apple Intermediate Codec decoder
movenc: Don't add base_data_offset in tfhd for PIFF files
Conflicts:
Changelog
libavcodec/allcodecs.c
libavcodec/avcodec.h
libavcodec/codec_desc.c
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-17 10:38:08 +02:00
Michael Niedermayer
c453da33a3
Merge commit '1fb013a57c6d98d3f425506eb25f32b2cf7ddc6f'
...
* commit '1fb013a57c6d98d3f425506eb25f32b2cf7ddc6f':
vc1dec: Add support for interlaced B-frames
Conflicts:
libavcodec/vc1dec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-17 10:23:40 +02:00
Jindrich Makovicka
259af1b923
mpegvideo: allocate sufficiently large scratch buffer for interlaced vid
...
MPV_decode_mb_internal needs 3 * 16 * linesize bytes of scratch buffer
For interlaced content, linesize is multiplied by two after the allocation
of the scratch buffer, and the dest_cr pointer ends past the buffer.
This patch makes ff_mpv_frame_size_alloc allocate a total of
(aligned line_size) * 2 * 16 * 3 bytes, which suffices even for the
interlaced case.
CC:libav-stable@libav.org
Signed-off-by: Jindrich Makovicka <makovick@gmail.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2013-05-17 07:49:05 +02:00
Anton Khirnov
db8e336e5f
pthread: reindent
2013-05-17 07:44:50 +02:00
Anton Khirnov
30e256430e
lavc/pthread: remove obsolete checks
...
Those were useful when avcodec_thread_init() was a public functions. It
was deprecated and removed some time ago, so those checks are not needed
anymore.
2013-05-17 07:44:40 +02:00
Kostya Shishkov
1232a1647a
Apple Intermediate Codec decoder
2013-05-17 06:31:05 +02:00
Michael Niedermayer
ab074ab9fe
avcodec/pthread: fix ffv1 with 2 threads
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-17 00:28:51 +02:00
Sebastian Sandberg
1fb013a57c
vc1dec: Add support for interlaced B-frames
...
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-05-17 00:28:37 +03:00
Clément Bœsch
6c5bd7d785
lavc/vc1dec: fix a few "may be used uninitialized" warnings.
2013-05-16 23:08:01 +02:00
Michael Niedermayer
09b3bbe605
libvpxenc: Fix "passing argument 3 of av_image_copy from incompatible pointer type" warning
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-16 22:54:16 +02:00
Michael Niedermayer
f4cc38e339
vc1dec: silence "may be used uninitialized in this function" warning from gcc
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-16 22:32:01 +02:00
Michael Niedermayer
c607a2cc97
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
sparc: Eliminate dead code in VIS acceleration macros
flacdec: drop unnecessary assert
mjpegdec: properly report unsupported disabled features
Conflicts:
libavcodec/flacdec.c
libavcodec/mjpegdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-16 17:10:51 +02:00
Michael Kostylev
4dbceaa3a8
sparc: Eliminate dead code in VIS acceleration macros
...
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2013-05-16 14:30:49 +02:00
Luca Barbato
39cc4c61de
flacdec: drop unnecessary assert
...
The condition cannot happen anymore.
2013-05-16 14:05:46 +02:00
Luca Barbato
b25e49b187
mjpegdec: properly report unsupported disabled features
...
When JPEG-LS support is disabled the decoder would feed the
data to the JPEG Lossless decode_*_scan function resulting in
faulty decoding.
CC: libav-stable@libav.org
2013-05-16 14:05:46 +02:00
Michael Niedermayer
efc08e00cc
Merge commit 'b3ea76624ad1baab0b6bcc13f3f856be2f958110'
...
* commit 'b3ea76624ad1baab0b6bcc13f3f856be2f958110':
vf_aspect: use the name 's' for the pointer to the private context
Remove commented-out debug #define cruft
Conflicts:
libavcodec/4xm.c
libavcodec/dvdsubdec.c
libavcodec/ituh263dec.c
libavcodec/mpeg12.c
libavfilter/avfilter.c
libavfilter/vf_aspect.c
libavfilter/vf_fieldorder.c
libavformat/rtmpproto.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-16 09:56:43 +02:00
Michael Niedermayer
39354d6089
Merge commit 'ff4fc5ef12a37716c5c5d8928a2db92428e916ec'
...
* commit 'ff4fc5ef12a37716c5c5d8928a2db92428e916ec':
jpegls: K&R formatting cosmetics
Conflicts:
libavcodec/jpegls.c
libavcodec/jpegls.h
libavcodec/jpeglsdec.c
libavcodec/jpeglsenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-16 09:46:19 +02:00
Michael Niedermayer
0d83b5722e
Merge commit '9cacdabd1c8cd257a942d8289349c37d992989b7'
...
* commit '9cacdabd1c8cd257a942d8289349c37d992989b7':
jpegls: cosmetics: Drop some unnecessary parentheses
mpegvideo: Remove commented-out PARANOID debug cruft
Conflicts:
libavcodec/jpegls.c
libavcodec/mpegvideo.c
libavcodec/x86/mpegvideo.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-16 09:19:11 +02:00
Michael Niedermayer
4390fa6273
Merge commit 'd46c588f3cb1963a00e990ceaf4ba9ffa05a716d'
...
* commit 'd46c588f3cb1963a00e990ceaf4ba9ffa05a716d':
Remove commented-out #includes
h263dec: Remove broken and disabled debug cruft
vc1: Reindent INIT_LUT(), align backslashes
Conflicts:
libavcodec/vc1.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-16 09:11:04 +02:00
Diego Biurrun
2832ea26f3
Remove commented-out debug #define cruft
2013-05-16 00:23:30 +02:00
Luca Barbato
ff4fc5ef12
jpegls: K&R formatting cosmetics
...
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2013-05-16 00:00:41 +02:00
Diego Biurrun
9cacdabd1c
jpegls: cosmetics: Drop some unnecessary parentheses
2013-05-15 23:58:04 +02:00
Diego Biurrun
004b81c465
mpegvideo: Remove commented-out PARANOID debug cruft
2013-05-15 23:53:42 +02:00
Diego Biurrun
bfd00cc4c2
h263dec: Remove broken and disabled debug cruft
2013-05-15 23:01:21 +02:00
Michael Niedermayer
e3c24f663e
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
configure: Use linker hardening flags on mingw
vc1: Make INIT_LUT() self contained
vc1: Simplify code by using INIT_LUT()
vc1: Move INIT_LUT() further up to allow using it in more places
vc1dec: Remove some now unused variables
vc1dec: Do not allow field_mode to change after the first header
vc1, mss2: Check for any negative return value from ff_vc1_parse_frame_header
vc1dec: Fix current ptr selection in vc1_mc_4mv_chroma()
vc1dec: Factorize picture pointer selection in vc1_mc_4mv_chroma()
vc1dec: Factorize picture pointer selection code
vc1dec: Factorize srcU/V offseting
vc1dec: Fix tff == 0 handling in init_block_index()
vc1dec: Update destination pointers in context for fields
Conflicts:
libavcodec/vc1.c
libavcodec/vc1dec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-15 20:09:20 +02:00
Martin Storsjö
b0696e947f
vc1: Reindent INIT_LUT(), align backslashes
...
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-05-15 20:59:24 +03:00
Michael Niedermayer
a9cadacdd9
dpxenc: dont shift into the sign bit.
...
Fixes IOC warnings
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-15 12:15:21 +02:00
Michael Niedermayer
6ce2c3106d
vc1: Make INIT_LUT() self contained
...
Move the local variables it uses into the macro, enclosing them
in a do {} while (0) scope.
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-05-15 12:42:53 +03:00
Michael Niedermayer
c7c71f95f8
replace remaining PIX_FMT_* flags with AV_PIX_FMT_FLAG_*
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-15 11:23:14 +02:00
Michael Niedermayer
37f2ac36a9
vc1: Simplify code by using INIT_LUT()
...
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-05-15 12:13:53 +03:00
Michael Niedermayer
0379fc1487
vc1: Move INIT_LUT() further up to allow using it in more places
...
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-05-15 12:13:53 +03:00
Martin Storsjö
3ca3709ad4
vc1dec: Remove some now unused variables
...
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-05-15 12:13:53 +03:00
Michael Niedermayer
4162fc62b3
vc1dec: Do not allow field_mode to change after the first header
...
This fixes out of array accesses.
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-05-15 12:13:53 +03:00
Martin Storsjö
ec7d002e55
vc1, mss2: Check for any negative return value from ff_vc1_parse_frame_header
...
This is required if we return other error codes than explicitly
-1, which so far has been the only other possible return value
besides 0.
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-05-15 12:13:53 +03:00
Michael Niedermayer
ff4680922f
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
pixdesc: rename PIX_FMT_* flags to AV_PIX_FMT_FLAG_*
Conflicts:
doc/APIchanges
libavcodec/avpicture.c
libavcodec/ffv1dec.c
libavcodec/ffv1enc.c
libavcodec/imgconvert.c
libavcodec/tiffenc.c
libavfilter/vf_pixdesctest.c
libavfilter/vf_scale.c
libavutil/imgutils.c
libavutil/pixdesc.c
libavutil/version.h
libswscale/swscale_internal.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-15 11:10:09 +02:00
Michael Niedermayer
ccb148e478
vc1dec: Fix current ptr selection in vc1_mc_4mv_chroma()
...
No sample tried shows a difference.
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-05-15 11:40:38 +03:00
Michael Niedermayer
201412ffec
vc1dec: Factorize picture pointer selection in vc1_mc_4mv_chroma()
...
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-05-15 11:40:17 +03:00
Michael Niedermayer
2412ad1717
vc1dec: Factorize picture pointer selection code
...
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-05-15 11:39:57 +03:00
Michael Niedermayer
19673db34a
vc1dec: Factorize srcU/V offseting
...
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-05-15 11:39:36 +03:00
Michael Niedermayer
012b319d91
vc1dec: Fix tff == 0 handling in init_block_index()
...
This fixes several files from VLC ticket 5887.
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-05-15 11:39:17 +03:00
Michael Niedermayer
75835abe91
Merge commit '7c57a582a03fb473091a88737ab92b9f2a5bb87a'
...
* commit '7c57a582a03fb473091a88737ab92b9f2a5bb87a':
jpeg2000dec: don't use deprecated PIX_FMT values
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-15 10:39:00 +02:00
Michael Niedermayer
0313653928
vc1dec: Update destination pointers in context for fields
...
This replaces a large number of checks for the second field by
fixing the pointers when they are setup.
This should also fix I/BI field pictures.
Changes checksums for vc1_sa10143, the file becomes slightly closer
to what the reference decoder outputs.
Based on "vc1dec: the second field is written wrong to the picture"
by Sebastian Sandberg <sebastiand.sandberg@gmail.com>.
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-05-15 11:38:49 +03:00
Michael Niedermayer
85de84c3e0
Merge commit '7cbc4cb4424430586ce2d5c0dba81174c6d1db01'
...
* commit '7cbc4cb4424430586ce2d5c0dba81174c6d1db01':
fate: update the mmf reference
mmf: Write metadata into an Optional Data chunk
jpeg2000dec: Use correct printf length modifier for pointer differences
Conflicts:
libavformat/mmf.c
tests/ref/lavf/mmf
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-15 10:15:15 +02:00
Michael Niedermayer
23439cf99b
Merge commit '5d9d8461fbb87046a7ca220d3676a045bd7ab46e'
...
* commit '5d9d8461fbb87046a7ca220d3676a045bd7ab46e':
vc1dec: Don't apply the loop filter on fields
Conflicts:
tests/ref/fate/vc1_sa10143
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-15 10:07:15 +02:00
Michael Niedermayer
cb22692f05
Merge commit 'fe06795d783785a76c6cbcaa2cd3012e6deb5fa5'
...
* commit 'fe06795d783785a76c6cbcaa2cd3012e6deb5fa5':
vc1: implement frame interlaced b-frame header parsing
Conflicts:
libavcodec/vc1.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-15 09:57:28 +02:00
Michael Niedermayer
b602e47f12
Merge commit '46430fd47c6239ef8742d0a34f9412d5060fa798'
...
* commit '46430fd47c6239ef8742d0a34f9412d5060fa798':
vc1dec: Don't attempt error concealment on field pictures
vc1dec: fieldtx is only valid for interlaced frame pictures
aacenc: Fix erasure of surround channels
aacenc: Fix target bitrate for twoloop quantiser search
Conflicts:
libavcodec/vc1dec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-15 09:49:17 +02:00
Michael Niedermayer
6bf6b9c279
Merge commit '252c0bfdc014c1fb6ad4fe06242c7beca58a6b41'
...
* commit '252c0bfdc014c1fb6ad4fe06242c7beca58a6b41':
lavc: Fix msvc compilation of utils.c with -WX (warnings treated as errors)
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-15 09:39:07 +02:00
Anton Khirnov
e6c4ac7b5f
pixdesc: rename PIX_FMT_* flags to AV_PIX_FMT_FLAG_*
2013-05-15 07:46:51 +02:00
Anton Khirnov
7c57a582a0
jpeg2000dec: don't use deprecated PIX_FMT values
2013-05-15 07:46:39 +02:00
Vignesh Venkatasubramanian
48de04f4ec
avcodec/avpacket: Refactoring copy_side_data into a separate function
...
Refactoring copy_side_data into a separate function so that it can be called
in cases where side data needs to be duplicated.
Signed-off-by: Vignesh Venkatasubramanian <vigneshv@google.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-14 22:51:12 +02:00
Michael Niedermayer
5d22ac488b
libx264: zero x264_picture before use.
...
This prevents use of uninitialized memory by ffmpeg later
(i_qpplus1)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-14 22:44:08 +02:00
Diego Biurrun
a349458e67
jpeg2000dec: Use correct printf length modifier for pointer differences
...
Also eliminate an unnecessary cast. Fixes the following warning:
jpeg2000dec.c:1200:20: warning: format ‘%lX’ expects argument of type ‘long unsigned int’, but argument 5 has type ‘long long unsigned int’
2013-05-14 16:46:56 +02:00
Martin Storsjö
5d9d8461fb
vc1dec: Don't apply the loop filter on fields
...
Fixes read of uninitialized memory.
Based on a patch by Michael Niedermayer.
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-05-14 14:36:00 +03:00
Hendrik Leppkes
fe06795d78
vc1: implement frame interlaced b-frame header parsing
...
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-05-14 13:24:55 +03:00
Michael Niedermayer
46430fd47c
vc1dec: Don't attempt error concealment on field pictures
...
This is not implemented and doesn't work.
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-05-14 13:24:52 +03:00
Michael Niedermayer
a887372109
Merge commit '1399931d07f0f37ef4526eb8d39d33c64e09618a'
...
* commit '1399931d07f0f37ef4526eb8d39d33c64e09618a':
x86: dsputil: Rename dsputil_mmx.h --> dsputil_x86.h
Conflicts:
libavcodec/x86/dsputil_mmx.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-14 12:12:20 +02:00
Sebastian Sandberg
1bd57a850a
vc1dec: fieldtx is only valid for interlaced frame pictures
...
The fieldtx_plane is not cleared for interlaced fields.
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-05-14 12:44:09 +03:00
Claudio Freire
8bbdd20a29
aacenc: Fix erasure of surround channels
...
This was due to a miscomputation of s->cur_channel, which led to
psy-based encoders using the psy coefficients for the wrong channel.
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-05-14 12:42:05 +03:00
Claudio Freire
f4d0a63b5b
aacenc: Fix target bitrate for twoloop quantiser search
...
This fixes a case where multichannel bitrate isn't accurately
targetted by psy model alone, never achieving the target bitrate.
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-05-14 12:42:04 +03:00
Claudio Freire
7c71ada4ca
aacenc: Fix a rounding bug in aacpsy channel bitrate computation
...
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-05-14 12:42:03 +03:00
Michael Niedermayer
b2da63db50
Merge commit '245b76a108585b6fb52eebc2626c472d6fa530dc'
...
* commit '245b76a108585b6fb52eebc2626c472d6fa530dc':
x86: dsputil: Split inline assembly from init code
Conflicts:
libavcodec/x86/dsputil_mmx.c
Note, the author attribution is left in place and not removed
as it is in the merged commit.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-14 11:19:20 +02:00
Michael Niedermayer
eda9d97b7a
Merge commit '46bb456853b197f4562de7acf5d42abf11ded9be'
...
* commit '46bb456853b197f4562de7acf5d42abf11ded9be':
x86: dsputil: Refactor pixels16 wrapper functions with a macro
Conflicts:
libavcodec/x86/hpeldsp_avg_template.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-14 10:18:46 +02:00
Matt Wolenetz
252c0bfdc0
lavc: Fix msvc compilation of utils.c with -WX (warnings treated as errors)
...
This fixes https://bugzilla.libav.org/show_bug.cgi?id=514 .
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-05-14 10:04:43 +03:00
Michael Niedermayer
1e00bbb10c
avcodec/lcldec: Check that dimensions are a multiple of the subsample factors
...
Other dimensions would not work correctly currently,
also ask for a sample for files that fail this check.
This fixes an integer overflow leading to out of array
accesses.
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-13 18:52:00 +02:00
Paul B Mahol
8671e995c8
imgconvert: silence "incompatible pointer type" warning
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-05-13 14:42:41 +00:00
Michael Niedermayer
f9db2fc84d
cdgraphics: initialize buffer
...
Prevent use of uninitialized memory
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-13 14:39:32 +02:00
Michael Niedermayer
e6b6ae4695
vorbisdec: check codebook entry count
...
Fixes assertion failure
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-13 14:27:35 +02:00
Michael Niedermayer
69d52ef8ff
Merge commit 'f54b55058a429c4eea5bae7e5bcb49bd29b34199'
...
* commit 'f54b55058a429c4eea5bae7e5bcb49bd29b34199':
configure: Rename cmov processor capability to i686
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-13 11:29:40 +02:00
Andrey Utkin
bc63a76083
pngenc: Add 'dpi', 'dpm' options
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-13 00:12:45 +02:00
Paul B Mahol
ae9ef151ad
dpxenc: simplifiy code using AVPixFmtDescriptor
...
Update rgb24 fate test as it no longer writes image in big endian
format.
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-05-12 21:56:29 +00:00
Paul B Mahol
22a038606c
dpxenc: do not set coded_frame
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-05-12 21:15:59 +00:00
Diego Biurrun
1399931d07
x86: dsputil: Rename dsputil_mmx.h --> dsputil_x86.h
...
The header is not (anymore) MMX-specific.
2013-05-12 22:28:07 +02:00
Diego Biurrun
245b76a108
x86: dsputil: Split inline assembly from init code
...
Also remove some pointless comments.
2013-05-12 22:28:07 +02:00
Diego Biurrun
46bb456853
x86: dsputil: Refactor pixels16 wrapper functions with a macro
2013-05-12 22:28:07 +02:00
Diego Biurrun
f54b55058a
configure: Rename cmov processor capability to i686
...
The goal is to make the capapility slightly more general and have it
cover the availability of the nopl instruction in addition to cmov.
2013-05-12 21:23:38 +02:00
Claudio Freire
e41cd3cdeb
aacenc: Fix ticket #1784 : erasure of surround channels
...
This was due to a miscomputation of s->cur_channel, which led to
psy-based encoders using the psy coefficients for the wrong channel.
Test sample attached on the bug tracker had the peculiar case of all
other channels being silent, so the error was far more noticeable.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-12 19:14:17 +02:00
Michael Niedermayer
cbcc5cbbd8
Merge remote-tracking branch 'jamrial/adpcm'
...
* jamrial/adpcm:
ADPCM IMA Radical decoder
RedSpark demuxer
RSD demuxer
adpcm_thp: Allow the use of extradata for the adpcm table
ADP demuxer
ADPCM DTK decoder
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-12 00:38:39 +02:00
Michael Niedermayer
9a2153894f
ffv1enc: fix 1000l typo
...
Thanks to ubitux for spotting that
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-11 21:33:03 +02:00
Michael Niedermayer
b8a2331a70
ffv1: check for malloc failure.
...
Somehow i managed to loose this fix before pushing
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-11 21:23:46 +02:00
Michael Niedermayer
bd63f8f657
ffv1enc: Fix memleak
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-11 21:03:54 +02:00
Michael Niedermayer
19411d32d4
ffv1enc: dont set coded_frame
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-11 20:37:20 +02:00
Michael Niedermayer
a0c0900e47
ffv1dec: Support frame threading with gop > 1
...
This is about 20-30% faster than slice threading
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-11 20:17:45 +02:00
Michael Niedermayer
54602590d9
ffv1enc: Check the return value of ffv1_common_init()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-11 20:17:09 +02:00
Michael Niedermayer
69cfe63a43
ffv1: Switch to ThreadFrame
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-11 20:16:49 +02:00
Michael Niedermayer
496f2df908
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
indeo3: avoid writes without necessary alignment in copy_cell()
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-10 23:26:32 +02:00
Michael Niedermayer
5e1278c640
Merge commit '2c299d4165cd9653153e12270971c2368551b79e'
...
* commit '2c299d4165cd9653153e12270971c2368551b79e':
x86: sbrdsp: implement SSE2 qmf_pre_shuffle
Conflicts:
libavcodec/x86/sbrdsp.asm
libavcodec/x86/sbrdsp_init.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-10 23:16:09 +02:00
James Almer
67fad0d221
ADPCM IMA Radical decoder
...
Signed-off-by: James Almer <jamrial@gmail.com>
2013-05-10 16:53:50 -03:00
James Almer
22c7784f60
adpcm_thp: Allow the use of extradata for the adpcm table
...
There are several containers that support adpcm_thp (Also known as Gamecube DSP)
streams, but only thp files contain the coeff table and previous sample inside
each frame.
Some don't even contain previous sample information at all.
This change will make it easier to implement demuxers for said containers
without having to create a new decoder.
Signed-off-by: James Almer <jamrial@gmail.com>
2013-05-10 16:10:53 -03:00
James Almer
e7814ed839
ADPCM DTK decoder
...
Signed-off-by: James Almer <jamrial@gmail.com>
2013-05-10 16:10:51 -03:00
Janne Grunau
94235f2ba2
indeo3: avoid writes without necessary alignment in copy_cell()
...
Cells starting at a position aligned to 8 pixels but wider than
4 blocks are copied with 3 blocks per loop. This creates problems on the
next loop iterations since the routine copying 2 blocks requires the
same alignment on some architectures like ARM NEON.
2013-05-10 12:02:09 +02:00
Christophe Gisquet
2c299d4165
x86: sbrdsp: implement SSE2 qmf_pre_shuffle
...
From 253 to 51 cycles on Arrandale and Win64.
44 cycles on SandyBridge.
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2013-05-10 09:31:27 +02:00
Michael Niedermayer
500220a8e8
mimic: Fix race condition
...
Fixes access after free.
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-10 01:40:24 +02:00
Paul B Mahol
13cb6ed3c4
takdec: simplify use of scalarproduct_int16 in decode_subframe()
...
Makes decoding little faster.
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-05-09 20:36:58 +00:00
Clément Bœsch
570d63eef3
lavu: add FF_CEIL_RSHIFT and use it in various places.
2013-05-09 16:59:42 +02:00
Michael Niedermayer
769efe56b1
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
x86: dsputil: Remove unused argument from QPEL_OP macro
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-09 11:55:46 +02:00
Michael Niedermayer
bda5487d92
Merge commit '3d40c1ee742db5f13ebcf53c2d1fa4bf4f39bcd2'
...
* commit '3d40c1ee742db5f13ebcf53c2d1fa4bf4f39bcd2':
x86: dsputil: Move TRANSPOSE4 macro to the only place it is used
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-09 11:43:00 +02:00
Michael Niedermayer
164899c6e8
Merge commit '71469f3b636fbe06b6aca5933f9fdebddd8d5f57'
...
* commit '71469f3b636fbe06b6aca5933f9fdebddd8d5f57':
x86: dsputil: Move constant declarations into separate header
Conflicts:
libavcodec/x86/dsputil_mmx.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-09 11:36:29 +02:00
Michael Niedermayer
5747d835c7
Merge commit 'ed880050edf061b38d3e39e25657c59ad9108b27'
...
* commit 'ed880050edf061b38d3e39e25657c59ad9108b27':
x86: dsputil: Group all assembly constants together in constants.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-09 11:23:40 +02:00
Michael Niedermayer
3469c24a10
Merge commit '87614667606b42476f9017d79faf12b45a0bd77c'
...
* commit '87614667606b42476f9017d79faf12b45a0bd77c':
x86: dsputil: Move ff_pd assembly constants to the only place they are used
Conflicts:
libavcodec/x86/lpc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-09 11:01:14 +02:00
Diego Biurrun
f243bf7aa2
x86: dsputil: Remove unused argument from QPEL_OP macro
2013-05-08 18:18:58 +02:00
Diego Biurrun
3d40c1ee74
x86: dsputil: Move TRANSPOSE4 macro to the only place it is used
2013-05-08 18:18:23 +02:00
Diego Biurrun
71469f3b63
x86: dsputil: Move constant declarations into separate header
2013-05-08 18:18:23 +02:00
Paul B Mahol
5c057433cc
libswscale: GBRAP input & output and GBRAP16 input support
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-05-08 12:48:05 +00:00
Michael Niedermayer
e3869dd17e
Merge commit '1b343cedd7cd68e7865aa5280d1568c7e5d79917'
...
* commit '1b343cedd7cd68e7865aa5280d1568c7e5d79917':
x86: dsputil: Remove unused ff_pb_3F constant
x86: dsputil: Remove unused MOVQ_BONE macro
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-08 14:13:48 +02:00
Michael Niedermayer
69d2eff5af
Merge commit '63bac48f734fc69cca2ef2cfada92cd9a222734d'
...
* commit '63bac48f734fc69cca2ef2cfada92cd9a222734d':
x86: dsputil: Move rv40-specific functions where they belong
Conflicts:
libavcodec/x86/dsputil_mmx.c
libavcodec/x86/dsputil_mmx.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-08 14:08:00 +02:00
Michael Niedermayer
2f9ef60c97
Merge commit '92f8e06ecb431a427ea13d794e5a6bc927a034d2'
...
* commit '92f8e06ecb431a427ea13d794e5a6bc927a034d2':
x86: dsputil hpeldsp: Move shared template functions into separate object
Conflicts:
libavcodec/x86/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-08 14:01:58 +02:00
Michael Niedermayer
bf18810a21
Merge commit '7edaf4edb5c3c04f34ad1242680cbc32d11f4087'
...
* commit '7edaf4edb5c3c04f34ad1242680cbc32d11f4087':
x86: rnd_template: Eliminate pointless OP_AVG macro indirection
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-08 13:55:31 +02:00
Michael Niedermayer
fe6a36e768
Merge commit 'e55e8b2c362a60bad66929d83d8c83b0d7f5ffc9'
...
* commit 'e55e8b2c362a60bad66929d83d8c83b0d7f5ffc9':
lavc: do not leak frames in avcodec_decode_audio4
Conflicts:
libavcodec/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-08 13:25:19 +02:00
Michael Niedermayer
e077ba8016
Merge commit 'a97d8cc16e0da30c9ffefa1ede2a0adf3db5f3f8'
...
* commit 'a97d8cc16e0da30c9ffefa1ede2a0adf3db5f3f8':
indeo3: use unaligned reads on reference blocks.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-08 11:54:29 +02:00
Michael Niedermayer
1bad40ef27
Merge commit '70f9661542a581dfe93b636b1c55b5558e4a4e3c'
...
* commit '70f9661542a581dfe93b636b1c55b5558e4a4e3c':
jpeg2000dec: initialize static data just once
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-08 11:46:41 +02:00
Michael Niedermayer
aecb3421f6
Merge commit '45a1694fde251ee56e23aec073d73172c00aa470'
...
* commit '45a1694fde251ee56e23aec073d73172c00aa470':
jpeg2000dec: cleanup properly after decoding errors
Conflicts:
libavcodec/jpeg2000dec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-08 11:41:54 +02:00
Christophe Gisquet
fc37cd4333
x86: sbrdsp: force PIC addressing for Win64
...
MSVC complains about the 32bits addressing, while mingw/gcc does not.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-08 03:07:03 +02:00
Michael Niedermayer
c67bca2b5a
avcodec/mpegvideo: Fix edge emu with lowres
...
Fixes a few green artifacts at the top
Fixes rest of Ticket 2535
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-08 01:18:56 +02:00
Michael Niedermayer
bca50e5cd5
avcodec/mpegvideo: Fix block height for lowres 3 interlaced blocks
...
Fixes green trash
Fixes part of Ticket2535
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-08 01:17:45 +02:00
Diego Biurrun
ed880050ed
x86: dsputil: Group all assembly constants together in constants.c
2013-05-08 01:04:04 +02:00
Diego Biurrun
8761466760
x86: dsputil: Move ff_pd assembly constants to the only place they are used
2013-05-08 01:04:04 +02:00
Michael Niedermayer
9dd04f6d8c
sanm: Check dimensions before use
...
Fixes integer overflow and out of array accesses
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-07 21:59:05 +02:00
Michael Niedermayer
ad002e1a13
avcodec/cdgraphics: check buffer size before use
...
Fixes out of array accesses
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-07 21:06:48 +02:00
Michael Niedermayer
ead590c256
dxa: check vectors of 2x2 motion blocks
...
Fixes out of array reads
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-07 20:33:46 +02:00
Michael Niedermayer
f96e0eb238
dxa: check vectors of 4x4 motion blocks
...
Fixes out of array reads
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-07 20:20:14 +02:00
Michael Niedermayer
89d998f1c1
shorten: allocate space for padding
...
Fixes array overread
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-07 20:05:53 +02:00
Diego Biurrun
1b343cedd7
x86: dsputil: Remove unused ff_pb_3F constant
2013-05-07 18:03:35 +02:00
Diego Biurrun
63bac48f73
x86: dsputil: Move rv40-specific functions where they belong
2013-05-07 18:03:35 +02:00
Diego Biurrun
3334cbec0a
x86: dsputil: Remove unused MOVQ_BONE macro
2013-05-07 18:03:35 +02:00
Diego Biurrun
92f8e06ecb
x86: dsputil hpeldsp: Move shared template functions into separate object
2013-05-07 18:03:34 +02:00
Diego Biurrun
7edaf4edb5
x86: rnd_template: Eliminate pointless OP_AVG macro indirection
2013-05-07 18:03:34 +02:00
Michael Niedermayer
d23b8462b5
gifdec: reset previous Graphic Control Extension disposal type
...
This fixes out of array accesses.
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-07 17:03:34 +02:00
Luca Barbato
e55e8b2c36
lavc: do not leak frames in avcodec_decode_audio4
...
Notwithstanding the return value the frame should be freed if
is not going to be used.
Reported-by: Matthew Wolenetz <wolenetz@chromium.org>
2013-05-07 14:37:32 +02:00
Michael Niedermayer
144baf427a
Merge remote-tracking branch 'cehoyos/master'
...
* cehoyos/master:
Support decoding of Lagarith frame type FRAME_SOLID_COLOR.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-07 14:21:49 +02:00
Gunther Piez
acc4a7e5b3
Ticket #2540 Enable threading when using -c:v libx264rgb
...
Signed-off-by: Gunther Piez <gupiez@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-07 13:38:15 +02:00
Anton Khirnov
a97d8cc16e
indeo3: use unaligned reads on reference blocks.
...
They are not guaranteed to be aligned.
Fixes Bug 503.
CC:libav-stable@libav.org
2013-05-07 12:29:56 +02:00
Carl Eugen Hoyos
f381dc1d61
Support decoding of Lagarith frame type FRAME_SOLID_COLOR.
...
Fixes bug 459.
2013-05-07 11:46:35 +02:00
Matt Wolenetz
004779cc59
avcodec/utils: Fix leak by dereferencing audio frame when side data causes whole frame skip
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-07 01:33:08 +02:00
Michael Niedermayer
974420a701
jpeg2000dec: fix memleaks in error cases in jpeg2000_decode_frame()
...
Reviewed-by: Nicolas BERTRAND <nicoinattendu@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-06 22:56:22 +02:00
Janne Grunau
70f9661542
jpeg2000dec: initialize static data just once
2013-05-06 22:45:47 +02:00
Janne Grunau
45a1694fde
jpeg2000dec: cleanup properly after decoding errors
...
Fixes memory leak in fate-redcode-demux.
2013-05-06 22:27:33 +02:00
Carl Eugen Hoyos
905e1e4b52
Cosmetics: Fix indentation and add braces after last commit.
2013-05-06 21:55:14 +02:00
Carl Eugen Hoyos
8b8fa09b65
vc1dec: Call ff_vdpau_vc1_decode_picture() once for each field.
...
Fixes mplayer -vc ffvc1vdpau for interlaced streams.
2013-05-06 21:55:14 +02:00
Rainer Hochecker
06d8fdb660
Fix vdpau vc1 interlace modes also when using decoder vc1_vdpau.
...
Signed-off-by: Carl Eugen Hoyos <cehoyos@ag.or.at>
2013-05-06 21:55:14 +02:00
Michael Niedermayer
050b48f397
Merge commit '6c5eac9a603a91a707d030d96ba97e2ef6b3ce50'
...
* commit '6c5eac9a603a91a707d030d96ba97e2ef6b3ce50':
swscale: Remove unnecessary backslashes
jpeg2000: Fix uninitialized data errors pointed out by valgrind/memcheck
Conflicts:
libavcodec/jpeg2000dec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-06 21:23:29 +02:00
Nicolas Bertrand
a06f0cef5b
jpeg2000: fix for uninitialized data errors in valgrind/memcheck
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-06 21:14:19 +02:00
Michael Niedermayer
108e2ae829
Merge commit '110796739ab32854dc0b6b0a1c95e6ae98889062'
...
* commit '110796739ab32854dc0b6b0a1c95e6ae98889062':
x86: hpeldsp: Move avg_pixels8_x2_mmx() out of hpeldsp_rnd_template.c
Conflicts:
libavcodec/x86/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-06 21:00:40 +02:00
Michael Niedermayer
a6e782434a
Merge commit 'dc1b328d0df6e5ad5ff0ca4ae031e08466624f9c'
...
* commit 'dc1b328d0df6e5ad5ff0ca4ae031e08466624f9c':
x86: hpeldsp: Only compile MMX hpeldsp code if MMX is enabled
Conflicts:
libavcodec/x86/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-06 20:53:37 +02:00
Michael Niedermayer
32cc7dacde
Merge commit '9e5e76ef9ea803432ef2782a3f528c3f5bab621e'
...
* commit '9e5e76ef9ea803432ef2782a3f528c3f5bab621e':
x86: More specific ifdefs for dsputil/hpeldsp init functions
Conflicts:
libavcodec/x86/dsputil_mmx.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-06 20:46:27 +02:00
Michael Niedermayer
8cdf95d9b8
snow: add av_cold where appropriate
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-06 16:58:17 +02:00
Michael Niedermayer
d2bf8aecd3
j2kdec: frame multithreading support
...
This allows comparing the 2 decoders with threads
Based on:commit 2e2d24667a
By: Nicolas Bertrand <nicoinattendu@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-06 16:38:03 +02:00
Nicolas Bertrand
28816f9db8
jpeg2000: Fix uninitialized data errors pointed out by valgrind/memcheck
...
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2013-05-06 13:07:00 +02:00
Carl Eugen Hoyos
76f43cbe26
Remove a superfluous include from libavcodec/options_table.h.
2013-05-06 12:16:50 +02:00
Diego Biurrun
110796739a
x86: hpeldsp: Move avg_pixels8_x2_mmx() out of hpeldsp_rnd_template.c
...
The function is only instantiated once, so there is no point
in keeping it in a template file.
2013-05-06 11:02:08 +02:00
Diego Biurrun
dc1b328d0d
x86: hpeldsp: Only compile MMX hpeldsp code if MMX is enabled
2013-05-06 11:02:08 +02:00
Diego Biurrun
9e5e76ef9e
x86: More specific ifdefs for dsputil/hpeldsp init functions
2013-05-06 11:02:07 +02:00
Michael Niedermayer
77c85cbd9d
Merge commit '46c1917350f58dfab84e41919e6c02d43950db8c'
...
* commit '46c1917350f58dfab84e41919e6c02d43950db8c':
nut: use a define for the nut version
bgmc: Do not mark ff_bgmc_decode_init() as av_cold
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-06 10:41:43 +02:00
Michael Niedermayer
b50ab3a4c7
Merge commit 'bd8ac882140a38868c33c000a430a1292a352533'
...
* commit 'bd8ac882140a38868c33c000a430a1292a352533':
avcodec: Add av_cold attributes to end functions missing them
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-06 10:28:27 +02:00
Michael Niedermayer
5a9e376049
h264: check mb_width/height
...
Fixes inconsistency that leads to out of array accesses with threads
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-06 01:58:10 +02:00
Michael Niedermayer
edabbfbaf2
ff_h264_decode_seq_parameter_set: dont set h->sps
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-06 00:37:47 +02:00
Michael Niedermayer
26482ae716
h264_sei/decode_picture_timing: do not depend on h->sps being set
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-06 00:35:25 +02:00
Michael Niedermayer
ccdaa31d86
ff_h264_decode_picture_parameter_set: fix return code
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-06 00:01:47 +02:00
Michael Niedermayer
dc35b77b28
ff_h264_decode_picture_parameter_set: use the correct sps
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-06 00:01:05 +02:00
Diego Biurrun
2d5fd7886a
bgmc: Do not mark ff_bgmc_decode_init() as av_cold
...
The function is possibly called once per block.
2013-05-05 20:51:52 +02:00
Diego Biurrun
bd8ac88214
avcodec: Add av_cold attributes to end functions missing them
2013-05-05 20:51:28 +02:00