Michael Niedermayer
bb8ce36dc2
Merge commit '5f5ada3dbf97e306a74250ba8dcf8619ad59b020'
...
* commit '5f5ada3dbf97e306a74250ba8dcf8619ad59b020':
shorten: Fix out-of-array read
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-11 09:20:26 +02:00
Paul B Mahol
996c73490c
avcodec/exr: remove pointless initialization
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-10-10 18:24:49 +00:00
Maxim Poliakovski
2d52834910
atrac3: Better name for imdct window initialization
...
Patch by Diego Biurrun.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-10 18:33:16 +02:00
Maxim Poliakovski
4fb8de08e1
atrac3: Remove unused gain compensation tables
...
Patch by Diego Biurrun.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-10 18:33:07 +02:00
Tim Walker
5f5ada3dbf
shorten: Fix out-of-array read
...
pred_order == FF_ARRAY_ELEMS(fixed_coeffs) is invalid too.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2013-10-10 17:52:14 +02:00
Maxim Poliakovski
ed796fba76
atrac3: Better name for IMDCT window initialization
...
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2013-10-10 14:29:54 +02:00
Maxim Poliakovski
be76415047
atrac3: Remove unused gain compensation tables
...
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2013-10-10 14:26:13 +02:00
Ronald S. Bultje
20d78a8606
libavcodec/x86: Fix emulated_edge_mc SSE code to not contain SSE2 instructions on x86-32.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-10 13:36:06 +02:00
Michael Niedermayer
ef6b85e9b8
avcodec/proresdec2: propagate error codes
...
Based-on: 44690dfa68
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-10 13:11:54 +02:00
Michael Niedermayer
0391f4617f
avcodec/vmnc/reset_buffers(): reset cur_hx/hy too for saftey
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-10 12:30:52 +02:00
Michael Niedermayer
3fa4c528a9
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
prores: Error out only on surely incomplete ac_coeffs
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-10 12:29:17 +02:00
Michael Niedermayer
5c99ca2288
Merge commit '44690dfa683f620c77e9f0e8e9bc5682608636b1'
...
* commit '44690dfa683f620c77e9f0e8e9bc5682608636b1':
prores: Add a codepath for decoding errors
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-10 12:21:15 +02:00
Michael Niedermayer
70025c07a7
Merge commit '41a10f3ba149a2012de499d0b4ad4955d81f28d5'
...
* commit '41a10f3ba149a2012de499d0b4ad4955d81f28d5':
vp6: Support cropping to AVCodecContext.width/height
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-10 11:38:36 +02:00
Michael Niedermayer
e96c80154f
Merge commit '1018a92219a38a812cf97761c6b3a5e66a400f4b'
...
* commit '1018a92219a38a812cf97761c6b3a5e66a400f4b':
jpeg2000: Check block length
See: 914ab4cd1c
See: 582f53349e
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-10 10:32:04 +02:00
Luca Barbato
2df7f7714a
prores: Error out only on surely incomplete ac_coeffs
2013-10-10 10:26:31 +02:00
Luca Barbato
44690dfa68
prores: Add a codepath for decoding errors
2013-10-10 09:47:03 +02:00
Michael Niedermayer
5a7a902ac3
Merge commit '071e29af4d383bdb44d0c87416dee3e4bb597936'
...
* commit '071e29af4d383bdb44d0c87416dee3e4bb597936':
vmnc: Use meaningful return values
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-10 09:45:30 +02:00
Martin Storsjö
41a10f3ba1
vp6: Support cropping to AVCodecContext.width/height
...
In these cases, there is no extradata but only the properly set
width/height values by the demuxer.
This makes sure VP6 in F4V files is cropped properly.
This is similar to what is done for H264 for letting the container
width/height override what's in the bitstream, since 30f515091
.
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-10-10 10:41:21 +03:00
Michael Niedermayer
20669753ce
Merge commit '5e992a4682d2c09eed3839c6cacf70db3b65c2f4'
...
* commit '5e992a4682d2c09eed3839c6cacf70db3b65c2f4':
vmnc: Check the cursor dimensions
Conflicts:
libavcodec/vmnc.c
See: 9437259276
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-10 09:39:07 +02:00
Michael Niedermayer
f18db82f29
Merge commit '61cd19b8bc32185c8caf64d89d1b0909877a0707'
...
* commit '61cd19b8bc32185c8caf64d89d1b0909877a0707':
vmnc: Port to bytestream2
Conflicts:
libavcodec/vmnc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-10 09:19:05 +02:00
Michael Niedermayer
7824b5f6f5
Merge commit 'a66aa0daf290ef157cb3322b034b43d6201c43e9'
...
* commit 'a66aa0daf290ef157cb3322b034b43d6201c43e9':
vmnc: K&R formatting cosmetics
Conflicts:
libavcodec/vmnc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-10 09:04:22 +02:00
Michael Niedermayer
65c2fe7159
avcodec/h264: call flush_change() on init
...
This ensures that all the non zero fields get setup correctly.
Alternatively their initialization could be duplicated.
Fixes Ticket2738
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-10 02:25:51 +02:00
Michael Niedermayer
5ac6b6028f
avcodec/h264_refs: modify key frame detection heuristic to detect more cases
...
Fixes Ticket2968
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-10 00:07:26 +02:00
Luca Barbato
1018a92219
jpeg2000: Check block length
...
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
2013-10-09 22:25:19 +02:00
Luca Barbato
071e29af4d
vmnc: Use meaningful return values
2013-10-09 22:25:01 +02:00
Luca Barbato
5e992a4682
vmnc: Check the cursor dimensions
...
And manage the reallocation failure path.
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
2013-10-09 22:25:01 +02:00
Luca Barbato
61cd19b8bc
vmnc: Port to bytestream2
...
Fix some buffer overreads.
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
2013-10-09 22:25:01 +02:00
Luca Barbato
a66aa0daf2
vmnc: K&R formatting cosmetics
...
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2013-10-09 22:25:01 +02:00
Paul B Mahol
8c7bc7d3e5
avcodec/exr: use avpriv_report_missing_feature()
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-10-09 13:46:44 +00:00
Paul B Mahol
19fda0a1bc
avcodec/vmnc: use av_freep()
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-10-09 12:54:45 +00:00
Michael Niedermayer
7f22df3a49
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
shorten: Extend fixed_coeffs to properly support pred_order 0
Conflicts:
libavcodec/shorten.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-09 11:04:06 +02:00
Carl Eugen Hoyos
3aabfaa37b
Fix make checkheaders for vp9 header files.
2013-10-09 09:42:16 +02:00
Luca Barbato
b2148faca9
shorten: Extend fixed_coeffs to properly support pred_order 0
...
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
2013-10-09 03:34:10 +02:00
Paul B Mahol
85b56e4803
avcodec/xwddec: use avpriv_report_missing_feature
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-10-08 12:40:33 +00:00
Paul B Mahol
3abbf20962
dpx: abgr support
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-10-08 12:40:33 +00:00
Ronald S. Bultje
ad75d2b590
x86: Fix compilation with nasm on PPC & OS/2
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-08 12:36:19 +02:00
Michael Niedermayer
deb5addcff
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
x86: h264_idct: Update comments to match 8/10-bit depth optimization split
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-08 12:10:02 +02:00
Michael Niedermayer
1f17619fe4
Merge commit 'bbe4a6db44f0b55b424a5cc9d3e89cd88e250450'
...
* commit 'bbe4a6db44f0b55b424a5cc9d3e89cd88e250450':
x86inc: Utilize the shadow space on 64-bit Windows
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-08 11:23:00 +02:00
Ronald S. Bultje
ba9c557b92
avcodec/x86/vp9dsp: Fix compilation with nasm.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-08 02:27:12 +02:00
Diego Biurrun
6405ca7d4a
x86: h264_idct: Update comments to match 8/10-bit depth optimization split
2013-10-07 21:46:46 +02:00
Michael Niedermayer
abf2d53d80
avcodec/options_table: add field_order
...
This allows setting and overriding the field order
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-07 18:23:20 +02:00
Paul B Mahol
23824b9698
avcodec/dpx: support for 8 and 16 bit luma only files
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-10-07 11:45:46 +00:00
Paul B Mahol
e745dc2d6f
avcodec/dpx: refactor pixel format selection
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-10-07 11:45:46 +00:00
Henrik Gramner
bbe4a6db44
x86inc: Utilize the shadow space on 64-bit Windows
...
Store XMM6 and XMM7 in the shadow space in functions that
clobbers them. This way we don't have to adjust the stack
pointer as often, reducing the number of instructions as
well as code size.
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2013-10-07 06:25:35 -04:00
Michael Niedermayer
b67cb58520
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
x86: fdct: Employ more specific ifdefs
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-07 11:37:47 +02:00
Paul B Mahol
62078f25ee
avcodec/dpx: return different error code for unsupported depths
...
Also give better message in such cases.
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-10-07 09:10:00 +00:00
Michael Niedermayer
630c005b87
avcodec/flac_parser: export sample_rate also when PARSER_FLAG_COMPLETE_FRAMES is set
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-07 01:36:05 +02:00
Paul B Mahol
ee3d03bf4e
avcodec/dpx: make .long_name more descriptive
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-10-06 20:17:10 +00:00
Paul B Mahol
8ec328668a
avcodec: add dpx parser
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-10-06 20:12:37 +00:00
Diego Biurrun
ce1e8045e0
x86: fdct: Employ more specific ifdefs
...
This avoids building mmxext and sse2 code when disabled by configure.
2013-10-06 22:02:25 +02:00