Michael Niedermayer
7eb40d85f2
Merge commit 'ef1b23ad21e3f12fc4ff2a73a6d4d4cd9d630c4b'
...
* commit 'ef1b23ad21e3f12fc4ff2a73a6d4d4cd9d630c4b': (21 commits)
jvdec: set channel layout
iss: set channel layout
ipmovie: set channel layout
iff: set channel layout
idroqdec: set channel layout
gxfdec: set channel layout when applicable
gsmdec: set channel layout
flvdec: set channel layout
dv: set channel layout
dsicin: set channel layout
daud: set channel layout
cdxl: set channel layout
bmv: set channel layout
bink: set channel layout
bfi: set channel layout
bethsoftvid: set channel layout
apc: set channel layout
amr: set channel_layout
ppc: replace pointer casting with AV_COPY32
ppc: fix some unused variable warnings
...
Conflicts:
libavformat/amr.c
libavformat/iff.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-13 10:55:07 +01:00
Michael Niedermayer
a8f2420e06
remove tests/asynth1.sw
...
This file appears to have been commited by 100l mistake.
Found-by: ubitux
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-13 10:36:25 +01:00
Clément Bœsch
f6f52936be
fate/avfilter: honor GPL dependency.
2012-11-13 09:16:26 +01:00
Michael Niedermayer
d8a1eb11b7
wavpack: check the blocks sample count, fix out of array accesses
...
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-13 01:13:07 +01:00
Michael Niedermayer
580021cfc4
wavpack: check ch_offset
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-13 01:11:59 +01:00
Michael Niedermayer
e9cb533fbb
flashv: check if keyframe is available, fix null deref.
...
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-13 00:22:24 +01:00
Michael Niedermayer
4b2f696d6e
flashv: use avcodec_set_dimensions()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-13 00:21:45 +01:00
Michael Niedermayer
0a373c31cb
svq1dec: dont export the qscale table.
...
SVQ1 has no qscales so the table is of no use, and it triggers a bug as
SVQ1 does not maintain the size of the table properly causing a crash.
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-12 23:01:42 +01:00
Michael Niedermayer
7ab690bf5f
indeo4: more complete check for the scan vs block sizes.
...
Fixes out of array reads
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-12 23:01:42 +01:00
Clément Bœsch
7581ad24a9
lavc/aac: fix shared build failures with MSVC.
...
This is a workaround until a better solution is found.
2012-11-12 22:28:57 +01:00
Michael Niedermayer
0e239b22db
xan: check size_segment before reading, fixes out of array read.
...
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-12 20:50:13 +01:00
Michael Niedermayer
a9456c7c5c
mjpegdec: tighten unescaped_buf_size size check, prevent null ptr deref
...
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-12 20:27:57 +01:00
Michael Niedermayer
abe68364a3
swfdec: check space before copy
...
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-12 19:29:27 +01:00
Michael Niedermayer
d1493d2ce5
theora: check that pix fmt is valid, fix null ptr deref
...
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-12 18:12:17 +01:00
Michael Niedermayer
9eef41b848
lagarith: always allocate for 4 planes. Fixes out of array accesses
...
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-12 18:05:08 +01:00
Paul B Mahol
87c113f4b3
wv: use right function to read block_samples
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2012-11-12 15:50:04 +00:00
Justin Ruggles
ef1b23ad21
jvdec: set channel layout
2012-11-12 10:33:20 -05:00
Justin Ruggles
4371131283
iss: set channel layout
2012-11-12 10:33:20 -05:00
Justin Ruggles
41a2d9590d
ipmovie: set channel layout
2012-11-12 10:33:19 -05:00
Justin Ruggles
024e03701c
iff: set channel layout
2012-11-12 10:33:19 -05:00
Justin Ruggles
73e2007f3d
idroqdec: set channel layout
2012-11-12 10:33:19 -05:00
Justin Ruggles
f6c3adde41
gxfdec: set channel layout when applicable
2012-11-12 10:33:19 -05:00
Justin Ruggles
d4a105ae5c
gsmdec: set channel layout
2012-11-12 10:33:19 -05:00
Justin Ruggles
644d8d2e5a
flvdec: set channel layout
2012-11-12 10:33:19 -05:00
Justin Ruggles
d5ca70b103
dv: set channel layout
2012-11-12 10:33:19 -05:00
Justin Ruggles
49e7af06f2
dsicin: set channel layout
2012-11-12 10:33:19 -05:00
Justin Ruggles
a05a63785c
daud: set channel layout
...
Update FATE reference due to WAVE channel mask now being set correctly.
2012-11-12 10:33:18 -05:00
Justin Ruggles
0d09a5848f
cdxl: set channel layout
2012-11-12 10:33:18 -05:00
Justin Ruggles
e8088d6e4b
bmv: set channel layout
2012-11-12 10:33:18 -05:00
Justin Ruggles
2fe804f316
bink: set channel layout
2012-11-12 10:33:18 -05:00
Justin Ruggles
ff50d27a63
bfi: set channel layout
2012-11-12 10:33:18 -05:00
Justin Ruggles
b5d1a15d1b
bethsoftvid: set channel layout
2012-11-12 10:33:18 -05:00
Justin Ruggles
39f0e9b8c6
apc: set channel layout
2012-11-12 10:33:18 -05:00
Justin Ruggles
5595368bcc
amr: set channel_layout
2012-11-12 10:33:18 -05:00
Michael Niedermayer
c433823750
4xmdec: test version for cfrms, fix out of array accesses
...
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-12 14:56:33 +01:00
Michael Niedermayer
be818df547
wavpack: fix out of array access
...
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-12 14:43:05 +01:00
Paul B Mahol
0cbb31a264
adpcm: reindent after previous commit
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2012-11-12 11:46:22 +00:00
Paul B Mahol
e8a9b1a1a0
adpcm: ADPCM IMA SMJPEG stereo decoding
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2012-11-12 11:46:22 +00:00
Paul B Mahol
0baec57d09
anm: return meaningful error codes
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2012-11-12 11:46:12 +00:00
Michael Niedermayer
4d60e5051e
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
binkaudio: set channel layout
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-12 12:18:58 +01:00
Michael Niedermayer
8c0a14d221
Merge commit '2b479bcab0a8365a7c094c5fa44b8cb6da9810d0'
...
These patches have not been merged at the request of Carl
* commit '2b479bcab0a8365a7c094c5fa44b8cb6da9810d0':
build: Drop AVX assembly ifdefs
x86: Require an assembler able to cope with AVX instructions
Conflicts:
libavcodec/x86/fft.asm
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-12 12:18:26 +01:00
Michael Niedermayer
03b078721c
Merge commit '97bf7c03b1338a867da52c159a2afecbdedcfa88'
...
* commit '97bf7c03b1338a867da52c159a2afecbdedcfa88':
doc: git-howto: Leave reviewers time to react before pushing patches
Include libavutil/channel_layout.h instead of libavutil/audioconvert.h
lavu: rename audioconvert.* to channel_layout.* and deprecate audioconvert.h
Conflicts:
doc/APIchanges
doc/examples/decoding_encoding.c
doc/git-howto.texi
ffmpeg_filter.c
libavcodec/flacdec.c
libavcodec/imc.c
libavcodec/mpegaudiodec.c
libavcodec/utils.c
libavfilter/asrc_anullsrc.c
libavfilter/audio.c
libavfilter/avfilter.c
libavfilter/avfilter.h
libavfilter/avfiltergraph.c
libavfilter/buffer.c
libavutil/Makefile
libavutil/audioconvert.h
libavutil/channel_layout.c
libavutil/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-12 11:32:11 +01:00
Mans Rullgard
a384f6a7f7
ppc: replace pointer casting with AV_COPY32
...
This removes warnings about strict aliasing violations.
Signed-off-by: Mans Rullgard <mans@mansr.com>
2012-11-12 10:31:31 +00:00
Mans Rullgard
031aac9861
ppc: fix some unused variable warnings
...
The third argument of OP_U8_ALTIVEC is evaluated at most once so
there is no need for a potentially unused temporary variable.
Signed-off-by: Mans Rullgard <mans@mansr.com>
2012-11-12 10:31:31 +00:00
Mans Rullgard
9eda2a85c6
configure: remove support for -n flag in print_enabled()
...
This flag is no longer used.
Signed-off-by: Mans Rullgard <mans@mansr.com>
2012-11-12 10:30:02 +00:00
Michael Niedermayer
da501ea857
Merge commit '802713c4e7b41bc2deed754d78649945c3442063'
...
* commit '802713c4e7b41bc2deed754d78649945c3442063':
mss2: prevent potential uninitialized reads
mss2: reindent after last commit
mss2: fix handling of unmasked implicit WMV9 rectangles
configure: add lavu dependency to lavr/lavfi .pc files
x86inc: Set program_name outside of x86inc.asm
Conflicts:
configure
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-12 10:57:06 +01:00
Justin Ruggles
faf340f60c
binkaudio: set channel layout
2012-11-12 00:41:02 -05:00
Michael Niedermayer
3a04c18d89
vc1dec: prevent null ptr dereferences.
...
The added checks are in line with existing checks but should
probably be replaced by more advanced error concealment at some
point.
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-12 01:43:12 +01:00
Michael Niedermayer
8e749733c1
vc1dec: factorize srcU/V offseting out
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-12 01:43:12 +01:00
Michael Niedermayer
b5f4836f8c
vc1: check image height, fix division by 0
...
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-12 01:43:12 +01:00