Justin Ruggles
0905c96390
pcm-bluray: decode directly to the user-provided AVFrame
2013-02-12 12:21:23 -05:00
Justin Ruggles
cbeb3ed38d
ralf: decode directly to the user-provided AVFrame
2013-02-12 12:21:23 -05:00
Justin Ruggles
0fe4056f95
nellymoser: decode directly to the user-provided AVFrame
2013-02-12 12:21:23 -05:00
Justin Ruggles
e01e1a4673
qdm2: decode directly to the user-provided AVFrame
2013-02-12 12:21:23 -05:00
Justin Ruggles
3a23752c5a
mpc7/8: decode directly to the user-provided AVFrame
2013-02-12 12:21:23 -05:00
Justin Ruggles
2c785e250a
mpegaudio: decode directly to the user-provided AVFrame
2013-02-12 12:21:23 -05:00
Justin Ruggles
dc33fbbfd0
mlp/truehd: decode directly to the user-provided AVFrame
2013-02-12 12:21:23 -05:00
Justin Ruggles
a8ea936a0a
libilbc: decode directly to the user-provided AVFrame
2013-02-12 12:21:22 -05:00
Justin Ruggles
cb7b47a61d
g726: decode directly to the user-provided AVFrame
2013-02-12 12:21:22 -05:00
Justin Ruggles
182821cff4
dca: decode directly to the user-provided AVFrame
2013-02-12 12:21:22 -05:00
Justin Ruggles
bed957bb11
libspeex: decode directly to the user-provided AVFrame
2013-02-12 12:21:22 -05:00
Justin Ruggles
b878867128
dpcm: decode directly to the user-provided AVFrame
2013-02-12 12:21:22 -05:00
Justin Ruggles
7e52fd6bca
g723.1: decode directly to the user-provided AVFrame
2013-02-12 12:21:22 -05:00
Justin Ruggles
7b78321597
cook: decode directly to the user-provided AVFrame
2013-02-12 12:21:22 -05:00
Justin Ruggles
19b2cb268f
libopus: decode directly to the user-provided AVFrame
2013-02-12 12:21:22 -05:00
Justin Ruggles
9b28e58357
imc/iac: decode directly to the user-provided AVFrame
2013-02-12 12:21:22 -05:00
Justin Ruggles
036e9b045f
g722: decode directly to the user-provided AVFrame
2013-02-12 12:21:22 -05:00
Justin Ruggles
0cd08367dd
libopencore-amr: decode directly to the user-provided AVFrame
2013-02-12 12:21:22 -05:00
Justin Ruggles
6fdfdb23d3
gsm: decode directly to the user-provided AVFrame
2013-02-12 12:21:22 -05:00
Justin Ruggles
b8e9c99ef1
flac: decode directly to the user-provided AVFrame
2013-02-12 12:21:22 -05:00
Justin Ruggles
4f69612d3e
libgsm: decode directly to the user-provided AVFrame
2013-02-12 12:21:22 -05:00
Justin Ruggles
97c7bdc6d4
cinaudio: decode directly to the user-provided AVFrame
2013-02-12 12:21:22 -05:00
Justin Ruggles
5cc0bd2cb4
binkaudio: decode directly to the user-provided AVFrame
2013-02-12 12:21:21 -05:00
Justin Ruggles
e3db34291f
amrnb: decode directly to the user-provided AVFrame
2013-02-12 12:21:21 -05:00
Justin Ruggles
e57daa876b
adpcm: decode directly to the user-provided AVFrame
2013-02-12 12:21:21 -05:00
Justin Ruggles
cddf8998f1
comfortnoise: decode directly to the user-provided AVFrame
2013-02-12 12:21:21 -05:00
Justin Ruggles
9a75ace2b2
atrac3: decode directly to the user-provided AVFrame
2013-02-12 12:21:21 -05:00
Justin Ruggles
9b0b355e97
als: decode directly to the user-provided AVFrame
2013-02-12 12:21:21 -05:00
Justin Ruggles
55d2e12aef
ac3: decode directly to the user-provided AVFrame
2013-02-12 12:21:21 -05:00
Justin Ruggles
e42e5a89d6
bmvaudio: decode directly to the user-provided AVFrame
2013-02-12 12:21:21 -05:00
Justin Ruggles
0ded61b57a
atrac1: decode directly to the user-provided AVFrame
2013-02-12 12:21:21 -05:00
Justin Ruggles
5cd597f22f
alac: decode directly to the user-provided AVFrame
2013-02-12 12:21:21 -05:00
Justin Ruggles
ffd2123095
aac: decode directly to the user-provided AVFrame
2013-02-12 12:21:21 -05:00
Justin Ruggles
a6bb39add2
pcm: decode directly to the user-provided AVFrame
2013-02-12 12:21:21 -05:00
Justin Ruggles
5932e2d7d2
ape: decode directly to the user-provided AVFrame
2013-02-12 12:21:21 -05:00
Justin Ruggles
bae4f47938
adxenc: alloc/free coded_frame instead of keeping it in the ADXContext
2013-02-12 12:21:21 -05:00
Justin Ruggles
a3de4010c2
8svx: decode directly to the user-provided AVFrame
2013-02-12 12:21:21 -05:00
Justin Ruggles
da28bb3f4a
amrwb: decode directly to the user-provided AVFrame
2013-02-12 12:21:21 -05:00
Justin Ruggles
0588935e64
adx: decode directly to the user-provided AVFrame
2013-02-12 12:21:21 -05:00
James Almer
0957041221
lavc/tta: Add support for encrypted streams
...
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-12 15:36:12 +01:00
Michael Niedermayer
7491356111
Merge commit '304b806cb524fb040f8e09a241040f1af2cb820b'
...
* commit '304b806cb524fb040f8e09a241040f1af2cb820b':
build: Make library minor version visible in the Makefile
x86: mpeg4qpel: Make movsxifnidn do the right thing
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-12 13:26:22 +01:00
Michael Niedermayer
fe54f6cb45
Merge commit '4c51fe48ba6dde059360b7451db7f6bbf2f11db3'
...
* commit '4c51fe48ba6dde059360b7451db7f6bbf2f11db3':
h264: Copy h264chroma dsp context to slice thread copies
swscale: Disallow conversion to GBRP16
Conflicts:
libswscale/utils.c
tests/ref/lavfi/pixdesc
tests/ref/lavfi/pixfmts_copy
tests/ref/lavfi/pixfmts_null
tests/ref/lavfi/pixfmts_scale
tests/ref/lavfi/pixfmts_vflip
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-12 13:18:28 +01:00
Ronald S. Bultje
7ff1a4b10f
Add add_pixels4/8() to h264dsp, and remove add_pixels4 from dsputil.
...
These functions are mostly H264-specific (the only other user I can
spot is bink), and this allows us to special-case some functionality
for H264. Also remove the 16-bit-coeff with >8bpp versions (unused)
and merge the duplicate 32-bit-coeff for >8bpp (identical).
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-12 02:14:16 +01:00
Michael Niedermayer
5260edee7e
sanm: Use the correct height variable in the decoded_size checks
...
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-02-12 02:04:24 +01:00
Michael Niedermayer
4ee88db840
sanm: init sizes with the full frame size
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-12 02:00:33 +01:00
Michael Niedermayer
f0d9ccac89
sanm: reset frame sizes on buffer destruction
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-12 01:59:07 +01:00
Michael Niedermayer
365270aec5
sanm: add forgotten check for decoded_size in old_codec37()
...
Fixes out of array accesses
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-12 01:15:57 +01:00
Ronald S. Bultje
972771dcf2
h264chroma: remove duplicate 9/10 bit functions.
...
Also use the resulting 16bpp functions for anything >8 and <=16, not just
9 and 10. This fixes 12 and 14bpp H264 support.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-11 22:54:52 +01:00
Daniel Kang
b3f2a3fe3f
x86: mpeg4qpel: Make movsxifnidn do the right thing
...
Fixes an instruction that does nothing by changing the
source to dword.
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2013-02-11 20:17:15 +01:00
Martin Storsjö
4c51fe48ba
h264: Copy h264chroma dsp context to slice thread copies
...
This fixes slice threading which seems to have been broken since
79dad2a93
.
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-02-11 21:12:21 +02:00
Michael Niedermayer
0aa1d848ec
ffv1enc: better heuristic to calculate initial states
...
Slightly improves compression of 2pass files
Tested-by: "Peter B." <pb@das-werkstatt.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-11 19:25:41 +01:00
Diego Biurrun
6fb296e97e
avcodec/rectangle: Remove nonsense assert
2013-02-11 16:23:09 +01:00
Derek Buitenhuis
c177f2ec4a
libfdk-aacenc: Actually check for upper bounds of cutoff
...
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2013-02-11 10:20:33 -05:00
Derek Buitenhuis
375ef6528c
libfdk-aacenc: Actually check for upper bounds of cutoff
...
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2013-02-11 10:15:42 -05:00
Michael Niedermayer
c3a62d3507
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
sparc: dsputil_vis: Fix silly variable name search and replace typo
Conflicts:
libavcodec/sparc/dsputil_vis.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-11 12:15:54 +01:00
Paul B Mahol
5d7009dac2
evrcdec: fix wrong condition
...
Fixes CID980005 and CID980004.
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-02-11 11:04:52 +00:00
Ronald S. Bultje
fd6a021d8e
get_bits: return pointer to buffer that is the result of the alignment.
...
This allows more transparent mixing of get_bits and whole-byte access
without having to touch get_bits internals.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-11 02:29:43 +01:00
Ronald S. Bultje
5e74a2b685
bit_depth_template: don't depend on dsputil.h.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-11 01:03:45 +01:00
Ronald S. Bultje
c7e3e55429
Move ff_emulated_edge_mc prototypes to videodsp.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-11 01:03:33 +01:00
Ronald S. Bultje
55e35c98d5
h264 intra pred: add missing includes.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-11 01:03:12 +01:00
Michael Niedermayer
8491ac3ad2
mlpdec: check ch_assign more completely
...
Fixes CID970924
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-11 00:50:29 +01:00
Diego Biurrun
d46d87d1d3
sparc: dsputil_vis: Fix silly variable name search and replace typo
2013-02-10 22:23:43 +01:00
Michael Niedermayer
0e3dacb11e
tiff: dont leave geotag_count in an invalid state on errors.
...
Fixes out of array reads
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-10 20:24:53 +01:00
Michael Niedermayer
f28043d0a3
tiff: check for failure in search_keyval()
...
Fixes null pointer dereference
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-10 20:18:16 +01:00
Michael Niedermayer
478fc7f57b
pictordec: fix cga palette index limit
...
Fixes out of array read
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-10 18:31:05 +01:00
Michael Niedermayer
cb85779d45
dpx: include offset in the total_size calculation
...
Fixes out of array reads
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-10 17:54:00 +01:00
Michael Niedermayer
151067bbc2
dpx: Fix rounding in 10bit total_size calculation
...
This could have caused out of array reads
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-10 17:52:24 +01:00
Michael Niedermayer
d24de4596c
pcx: Add missing padding to scanline buffer
...
Fixes out of array read
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-10 17:32:05 +01:00
Michael Niedermayer
f41329c8ae
pcx: use init_get_bits8()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-10 17:32:05 +01:00
Michael Niedermayer
6462268e74
pcx: fix rounding in bytes_per_scanline check
...
Fixes out of array reads
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-10 16:52:38 +01:00
Carl Eugen Hoyos
034a125c8c
Support more atrac3-in-mkv samples.
...
The mkv demuxer sometimes finds 12 bytes of realmedia
extradata after the matroska real audio properties.
2013-02-10 14:44:00 +01:00
Michael Niedermayer
0af4506e15
Merge commit '36fab50e90d15352e403e4cc210890810f2fb4e2'
...
* commit '36fab50e90d15352e403e4cc210890810f2fb4e2':
asfdec: silence a warning
mss4, ra288: Remove unused DSPContext local codec context members
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-10 12:14:14 +01:00
Michael Niedermayer
cf8d9b74f3
imgconvert: use get_pix_fmt_score in avcodec_find_best_pix_fmt_of_2()
...
This fixes various poorly choosen pixel format cases.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-10 02:15:13 +01:00
Michael Niedermayer
13ae02d03f
imgconvert: add get_pix_fmt_score()
...
get_pix_fmt_score() returns a score representing the amount
of loss when converting a pixel format
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-10 02:14:52 +01:00
Michael Niedermayer
796012af6c
targa: Fix y check in advance_line
...
Fixes out of array accesses
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-09 21:21:26 +01:00
Paul B Mahol
350128b28f
rv10: remove check that is always true
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-02-09 19:32:43 +00:00
Michael Niedermayer
b5fc95e77f
motionpixels: Check that the vlc table has been fully inited
...
Fixes out of array reads
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-09 18:44:01 +01:00
Michael Niedermayer
4401958fdc
motionpixels: Propagate errors in vlc table init
...
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
2013-02-09 18:44:01 +01:00
Paul B Mahol
da726a8763
paf, sanm: remove unused header after b05830169d
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-02-09 14:16:53 +00:00
Michael Niedermayer
5cfc0ae825
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
dsputil: Move fdct function declarations to dct.h
Conflicts:
libavcodec/dsputil.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-09 14:45:45 +01:00
Michael Niedermayer
6b2e65078c
Merge commit '218aefce4472dc02ee3f12830a9a894bf7916da9'
...
* commit '218aefce4472dc02ee3f12830a9a894bf7916da9':
dsputil: Move LOCAL_ALIGNED macros to libavutil
Conflicts:
libavcodec/dvdec.c
libavcodec/imc.c
libavcodec/mpegvideo_motion.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-09 14:33:57 +01:00
Diego Biurrun
8658e1c682
mss4, ra288: Remove unused DSPContext local codec context members
2013-02-09 14:32:06 +01:00
Michael Niedermayer
276c9c0577
Merge commit '059866eb17cd3c66422a61d3e9c3305f55830a50'
...
* commit '059866eb17cd3c66422a61d3e9c3305f55830a50':
dsputil: Move WRAPPER8_16_SQ macro to the only place it is used
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-09 14:27:44 +01:00
Michael Niedermayer
5fd6d85d17
rnd_avg: fix author attribution
...
Reference:
commit 41fda91d09
Author: BERO <bero@geocities.co.jp>
Date: Wed May 14 17:46:55 2003 +0000
aligned dsputil (for sh4) patch by (BERO <bero at geocities dot co dot jp>)
Originally committed as revision 1880 to svn://svn.ffmpeg.org/ffmpeg/trunk
commit 8dbe585641
Author: Oskar Arvidsson <oskar@irock.se>
Date: Tue Mar 29 17:48:59 2011 +0200
Adds 8-, 9- and 10-bit versions of some of the functions used by the h264 decoder.
This patch lets e.g. dsputil_init chose dsp functions with respect to
the bit depth to decode. The naming scheme of bit depth dependent
functions is <base name>_<bit depth>[_<prefix>] (i.e. the old
clear_blocks_c is now named clear_blocks_8_c).
Note: Some of the functions for high bit depth is not dependent on the
bit depth, but only on the pixel size. This leaves some room for
optimizing binary size.
Preparatory patch for high bit depth h264 decoding support.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-09 14:22:29 +01:00
Michael Niedermayer
81a11452f8
Merge commit 'bf6b3ec924b4fb64d14df33077f4d4541d525dbf'
...
* commit 'bf6b3ec924b4fb64d14df33077f4d4541d525dbf':
dsputil: Move rnd_avg inline functions to a separate header
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-09 14:22:05 +01:00
Michael Niedermayer
a8864615e6
Merge commit 'b9c2408b19dc9408e9dc0ce4a099af529bbfba3b'
...
* commit 'b9c2408b19dc9408e9dc0ce4a099af529bbfba3b':
dsputil: Remove commented-out, unused function declarations
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-09 13:51:47 +01:00
Michael Niedermayer
ffbe19fc84
Merge commit '35685a3c2a1ec09f3c62dcfc4368fe9e92bcddf6'
...
* commit '35685a3c2a1ec09f3c62dcfc4368fe9e92bcddf6':
dsputil: Move ff_shrink* function declarations to separate header
dsputil: Move ff_svq3 function declarations to a separate header
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-09 13:46:03 +01:00
Michael Niedermayer
0af07495ec
Merge commit '6a4430407404bfe55581e66a86a496c9adf6fb44'
...
* commit '6a4430407404bfe55581e66a86a496c9adf6fb44':
dsputil: Move ff_h264_idct function declarations to a separate header
Conflicts:
libavcodec/dsputil.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-09 13:40:03 +01:00
Michael Niedermayer
b05830169d
Merge commit 'b9ba5253dd1232be4b48cfe61c31ff4b3de3d10a'
...
* commit 'b9ba5253dd1232be4b48cfe61c31ff4b3de3d10a':
dsputil: Move copy_block functions to a separate header
dsputil: Drop unused functions copy_block{2|4|16}
No functions are droped because they are used in several places.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-09 13:23:59 +01:00
Michael Niedermayer
e5212354ea
Merge commit 'b9ee5f2cab3ffe1c962e542346b1ed61394864ec'
...
* commit 'b9ee5f2cab3ffe1c962e542346b1ed61394864ec':
indeo3: replace use of copy_block4 with put_pixels
mjpegdec: use put_pixels instead of copy_block8
Conflicts:
libavcodec/mjpegdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-09 12:37:03 +01:00
Michael Niedermayer
bcb15e66f7
Merge commit 'b5b7b75e91e291c810ebd01868a42b53f267a87c'
...
* commit 'b5b7b75e91e291c810ebd01868a42b53f267a87c':
dsputil: Move get_penalty_factor() to the only place it is used.
Conflicts:
libavcodec/dsputil.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-09 12:05:53 +01:00
Michael Niedermayer
55151aa101
Merge commit '0b016eb99d38738e2c53e36549a4732a0f863b2e'
...
* commit '0b016eb99d38738e2c53e36549a4732a0f863b2e':
dsputil: Move ff_block_permute to mpegvideo_enc
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-09 11:44:46 +01:00
James Almer
53b2083f44
sparc: Revert some parameter name changes in dsputil_vis.c
...
They were renamed by mistake in 25841df
.
This should fix compilation failures on sparc.
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-09 02:59:15 +01:00
Michael Niedermayer
a92816c4eb
get_se_golomb: fix decoding of very large values
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-09 01:17:41 +01:00
Diego Biurrun
5d3d39c72e
dsputil: Move fdct function declarations to dct.h
2013-02-09 00:08:28 +01:00
Diego Biurrun
218aefce44
dsputil: Move LOCAL_ALIGNED macros to libavutil
2013-02-08 23:13:37 +01:00
Diego Biurrun
059866eb17
dsputil: Move WRAPPER8_16_SQ macro to the only place it is used
2013-02-08 23:10:17 +01:00
Diego Biurrun
bf6b3ec924
dsputil: Move rnd_avg inline functions to a separate header
2013-02-08 23:10:17 +01:00
Diego Biurrun
b9c2408b19
dsputil: Remove commented-out, unused function declarations
2013-02-08 23:10:16 +01:00
Michael Niedermayer
b8820e7aa3
dsp: make put_no_rnd_pixels_tab 4x4 big
...
This makes it match the other tables and fixes out of array acceses.
Fixes CID980012
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-08 22:55:55 +01:00
James Almer
89946c8403
dxva2: Prevent redefinition of _WIN32_WINNT
...
Don't redefine _WIN32_WINNT when targeting Win7/8
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-08 14:10:19 +01:00
Michael Niedermayer
0d194ee51e
vc1dec: Fix 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: Michael Niedermayer <michaelni@gmx.at>
2013-02-08 00:10:29 +01:00
Diego Biurrun
35685a3c2a
dsputil: Move ff_shrink* function declarations to separate header
2013-02-07 22:08:19 +01:00
Diego Biurrun
6a44304074
dsputil: Move ff_h264_idct function declarations to a separate header
2013-02-07 22:08:19 +01:00
Diego Biurrun
b9ba5253dd
dsputil: Move copy_block functions to a separate header
2013-02-07 22:08:19 +01:00
Mans Rullgard
b9ee5f2cab
indeo3: replace use of copy_block4 with put_pixels
...
The destination is sufficiently aligned for put_pixels here.
Signed-off-by: Mans Rullgard <mans@mansr.com>
2013-02-07 22:08:19 +01:00
Diego Biurrun
75d5156ac1
dsputil: Move ff_svq3 function declarations to a separate header
2013-02-07 22:08:19 +01:00
Diego Biurrun
9e31729d69
dsputil: Drop unused functions copy_block{2|4|16}
2013-02-07 22:08:19 +01:00
Mans Rullgard
ed62e6e3c3
mjpegdec: use put_pixels instead of copy_block8
...
Signed-off-by: Mans Rullgard <mans@mansr.com>
2013-02-07 22:08:19 +01:00
Diego Biurrun
b5b7b75e91
dsputil: Move get_penalty_factor() to the only place it is used.
2013-02-07 22:05:25 +01:00
Diego Biurrun
0b016eb99d
dsputil: Move ff_block_permute to mpegvideo_enc
2013-02-07 22:05:25 +01:00
Michael Niedermayer
48870853b2
x86/dsputil: Fix author attribution after code has been moved/splited around
...
Reference:
commit 3615e2be84
Author: Michael Niedermayer <michaelni@gmx.at>
Date: Tue Dec 2 22:02:57 2003 +0000
h263_h_loop_filter_mmx
Originally committed as revision 2553 to svn://svn.ffmpeg.org/ffmpeg/trunk
commit 359f98ded9
Author: Michael Niedermayer <michaelni@gmx.at>
Date: Tue Dec 2 20:28:10 2003 +0000
h263_v_loop_filter_mmx
Originally committed as revision 2552 to svn://svn.ffmpeg.org/ffmpeg/trunk
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-07 16:22:51 +01:00
Michael Niedermayer
54d8322355
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
dsputil: x86: Fix compile error
dsputil: x86: Convert h263 loop filter to yasm
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-07 14:35:49 +01:00
Michael Niedermayer
c7002e3d3d
Merge commit '12b54a1f39fee22fa0399825ae47a43e60bad4c5'
...
* commit '12b54a1f39fee22fa0399825ae47a43e60bad4c5':
mpegvideo: remove an unused function parameter
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-07 14:28:30 +01:00
Michael Niedermayer
1c65393906
Merge commit '605b047bcc48482dc8a356f56629da259fbddbf1'
...
* commit '605b047bcc48482dc8a356f56629da259fbddbf1':
rv10: improve buffer size check.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-07 14:02:23 +01:00
Michael Niedermayer
b8d6108cfc
error_resilience: assert that unsupported B frame interpolation isnt used with h264
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-07 13:59:45 +01:00
Michael Niedermayer
7f23b2a9d0
Merge commit 'c5fcdb440237f06f6c954185ab60970cabf786a2'
...
* commit 'c5fcdb440237f06f6c954185ab60970cabf786a2':
error_resilience: remove a useless if() and FIXME
h264: remove silly macros
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-07 13:49:04 +01:00
Michael Niedermayer
d5518545d1
Merge commit 'ca1fe6c0e60808da45d4dfd8728f45e843b9f9b0'
...
* commit 'ca1fe6c0e60808da45d4dfd8728f45e843b9f9b0':
h263: remove an unused parameter from ff_h263_decode_init_vlc
flac: add channel layout masks for streams with 7 or 8 channels.
flac: don't check the number of channels before setting the channel layout.
Conflicts:
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-07 13:42:56 +01:00
Michael Niedermayer
60a0bc46cd
Merge commit 'a846dccb29d2bb0798af1d47d06100eda9ca87cc'
...
* commit 'a846dccb29d2bb0798af1d47d06100eda9ca87cc':
h264chroma: x86: Fix building with yasm disabled
rv34: Drop now unnecessary dsputil dependencies
Conflicts:
libavcodec/x86/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-07 13:35:49 +01:00
Michael Niedermayer
c4e394e460
Merge commit '79dad2a932534d1155079f937649e099f9e5cc27'
...
* commit '79dad2a932534d1155079f937649e099f9e5cc27':
dsputil: Separate h264chroma
Conflicts:
libavcodec/dsputil_template.c
libavcodec/ppc/dsputil_ppc.c
libavcodec/vc1dec.c
libavcodec/vc1dsp.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-07 13:09:35 +01:00
Tim Walker
08797c599d
flac: don't check the number of channels before setting the channel layout
...
This is unnecessary, as ff_flac_set_channel_layout can handle any number of channels.
2013-02-07 09:36:21 +00:00
Daniel Kang
a1d3673034
dsputil: x86: Fix compile error
...
Accidentally prefixed ff_ with cextern.
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-02-07 11:06:16 +02:00
Daniel Kang
659d4ba5af
dsputil: x86: Convert h263 loop filter to yasm
...
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2013-02-06 15:38:27 -08:00
Anton Khirnov
12b54a1f39
mpegvideo: remove an unused function parameter
2013-02-06 21:48:48 +01:00
Anton Khirnov
605b047bcc
rv10: improve buffer size check.
...
Check slice count and input buffer size before constructing a possibly
invalid pointer, not after.
2013-02-06 21:47:57 +01:00
Anton Khirnov
c5fcdb4402
error_resilience: remove a useless if() and FIXME
...
pp_time is never set for h264
2013-02-06 21:46:55 +01:00
Anton Khirnov
9782c778a2
h264: remove silly macros
...
They serve no useful purpose and wreak all kind of havoc when h264.h is
included elsewhere.
2013-02-06 21:45:02 +01:00
Anton Khirnov
ca1fe6c0e6
h263: remove an unused parameter from ff_h263_decode_init_vlc
2013-02-06 21:44:38 +01:00
Tim Walker
9d083d6417
flac: add channel layout masks for streams with 7 or 8 channels.
...
They were added to the latest FLAC specification:
https://git.xiph.org/?p=flac-website.git;a=commit;h=65c199a2
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2013-02-06 21:44:06 +01:00
Tim Walker
41244e13d5
flac: don't check the number of channels before setting the channel layout.
...
This is unnecessary, as ff_flac_set_channel_layout can handle any number of channels.
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2013-02-06 21:43:05 +01:00
Michael Niedermayer
78dc4cb26d
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
mpegvideo: initialize dummy reference frames.
Conflicts:
libavcodec/mpegvideo.c
tests/ref/fate/filter-yadif-mode1
The luma init is left at 0x80 as it was previously, and tested and
working since a long time. Its also mandated to be 0x80 by at least
one specification. Cases that need different values already had
code in place to handle them.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-06 16:59:32 +01:00
Michael Niedermayer
d71f8d74db
qtrle: fix 1bit row_ptr comment
...
Found-by: aballier
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-06 16:46:23 +01:00
Michael Niedermayer
0b74fd1134
Merge commit 'dff6197dfb9b2d145729885c63f865c5fdd184aa'
...
* commit 'dff6197dfb9b2d145729885c63f865c5fdd184aa':
nuv: do not rely on get_buffer() initializing the frame.
yop: initialize palette to 0
Conflicts:
libavcodec/nuv.c
tests/ref/fate/nuv-rtjpeg-fh
tests/ref/fate/yop
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-06 16:40:59 +01:00
Michael Niedermayer
73562f1f83
Merge commit '8136f234445862c94d1c081606b2d1e3d44fccf3'
...
* commit '8136f234445862c94d1c081606b2d1e3d44fccf3':
yop: check for input overreads.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-06 16:25:16 +01:00
Martin Storsjö
a846dccb29
h264chroma: x86: Fix building with yasm disabled
...
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-02-06 17:05:33 +02:00
Michael Niedermayer
3138b158dd
Merge commit '06cf597c352519d2b70f293518c61b8c312f5d4f'
...
* commit '06cf597c352519d2b70f293518c61b8c312f5d4f':
yop: check that extradata is large enough.
Conflicts:
libavcodec/yop.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-06 16:05:06 +01:00
Michael Niedermayer
769eba75ee
Merge commit '89f11f498b9c15bc71494a11a7ec560f4adf630d'
...
* commit '89f11f498b9c15bc71494a11a7ec560f4adf630d':
qtrle: fix the topmost line for 1bit
Conflicts:
tests/ref/fate/qtrle-1bit
See: 1af91978db
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-06 15:57:45 +01:00
Michael Niedermayer
68c0144d02
Merge commit '685e6f2e3939f124b41c7801cc541dad8252af3d'
...
* commit '685e6f2e3939f124b41c7801cc541dad8252af3d':
xxan: properly handle odd heights.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-06 15:26:32 +01:00
Michael Niedermayer
a845ac78c9
Merge commit '2cd4068071b9a8908823a3107f97e938211045ce'
...
* commit '2cd4068071b9a8908823a3107f97e938211045ce':
fraps: fix off-by one bug for version 1.
Conflicts:
libavcodec/fraps.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-06 15:21:39 +01:00
Michael Niedermayer
ddc3ca2caa
Merge commit 'da7baaaae79b4d7d715d35ea6bcfbdd149edc177'
...
* commit 'da7baaaae79b4d7d715d35ea6bcfbdd149edc177':
aasc: fix output for msrle compression.
msrledec: check bounds before constructing a possibly invalid pointer,
cmdutils: remove ansi from the list of broken codecs.
Conflicts:
tests/ref/fate/aasc
Also See: e7117f1c10
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-06 15:16:51 +01:00
Michael Niedermayer
6e9f3f3b65
Merge commit '238614de679a71970c20d7c3fee08a322967ec40'
...
* commit '238614de679a71970c20d7c3fee08a322967ec40':
cdgraphics: do not rely on get_buffer() initializing the frame.
svq1: replace struct svq1_frame_size with an array.
vf_yadif: silence a warning.
Conflicts:
libavcodec/svq1dec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-06 14:53:49 +01:00
Michael Niedermayer
fadf845973
Merge commit '48a4ffa722c0874b251de9d201babed52cef0bcb'
...
* commit '48a4ffa722c0874b251de9d201babed52cef0bcb':
asf: K&R formatting cosmetics
vc1dec: use codec_id instead of codec_tag for VC1IMAGE
sh4: drop unused functions
Conflicts:
libavformat/asf.c
libavformat/asfdec.c
libavformat/asfenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-06 14:25:28 +01:00
Tim Walker
7af876a93f
flac: add channel layout masks for streams with 7 or 8 channels
...
They were added to the latest FLAC specification:
https://git.xiph.org/?p=flac-website.git;a=commit;h=65c199a2
2013-02-06 12:53:15 +00:00
James Almer
8ab2173ed1
lavc/bink: Chech for malloc failure
...
Signed-off-by: James Almer <jamrial@gmail.com>
2013-02-06 12:35:33 +00:00
Michael Niedermayer
6c38884876
Merge commit '620289a20e022b9c16c10d546ef86cc0bb77cc84'
...
* commit '620289a20e022b9c16c10d546ef86cc0bb77cc84':
sh4: Fix silly type vs. variable name search and replace typo
configure: Group all hwaccels together in a separate variable
Add av_cold attributes to arch-specific init functions
Conflicts:
configure
libavcodec/arm/mpegvideo_armv5te.c
libavcodec/x86/mlpdsp.c
libavcodec/x86/motion_est.c
libavcodec/x86/mpegvideoenc.c
libavcodec/x86/videodsp_init.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-06 13:27:24 +01:00
Michael Niedermayer
0ddca7d416
dsputil: fixup half a dozen bugs with ptrdiff vs int linesize
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-06 13:22:19 +01:00
Michael Niedermayer
ede45c4e1d
Merge commit '25841dfe806a13de526ae09c11149ab1f83555a8'
...
* commit '25841dfe806a13de526ae09c11149ab1f83555a8':
Use ptrdiff_t instead of int for {avg, put}_pixels line_size parameter.
Conflicts:
libavcodec/alpha/dsputil_alpha.c
libavcodec/dsputil_template.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-06 12:18:25 +01:00
Diego Biurrun
82bd04b170
rv34: Drop now unnecessary dsputil dependencies
2013-02-06 11:30:54 +01:00
Diego Biurrun
79dad2a932
dsputil: Separate h264chroma
2013-02-06 11:30:53 +01:00
Anton Khirnov
293065bdb5
mpegvideo: initialize dummy reference frames.
...
Do not rely on get_buffer initializing them.
Changes yadif tests (off by one in one border pixel), because yadif
reads from those uninitialized lines.
2013-02-06 10:21:52 +01:00
Anton Khirnov
dff6197dfb
nuv: do not rely on get_buffer() initializing the frame.
2013-02-06 10:21:52 +01:00
Anton Khirnov
8136f23444
yop: check for input overreads.
...
CC:libav-stable@libav.org
2013-02-06 10:21:52 +01:00
Anton Khirnov
06cf597c35
yop: check that extradata is large enough.
...
CC:libav-stable@libav.org
2013-02-06 10:21:52 +01:00
Kostya Shishkov
89f11f498b
qtrle: fix the topmost line for 1bit
...
Signed-off-by: Anton Khirnov <anton@khirnov.net>
CC:libav-stable@libav.org
2013-02-06 10:21:52 +01:00
Kostya Shishkov
685e6f2e39
xxan: properly handle odd heights.
...
Duplicate the last one or two chroma lines.
Signed-off-by: Anton Khirnov <anton@khirnov.net>
CC:libav-stable@libav.org
2013-02-06 10:21:52 +01:00
Anton Khirnov
2cd4068071
fraps: fix off-by one bug for version 1.
...
CC:libav-stable@libav.org
2013-02-06 10:21:52 +01:00
Anton Khirnov
da7baaaae7
aasc: fix output for msrle compression.
...
The bottom line was invalid before.
CC:libav-stable@libav.org
2013-02-06 10:21:52 +01:00
Anton Khirnov
238614de67
cdgraphics: do not rely on get_buffer() initializing the frame.
...
Setting it to zero (instead of 128, as the default get_buffer() does)
also produces more correctly-looking output.
2013-02-06 10:21:52 +01:00
Anton Khirnov
39a9fdd00f
yop: initialize palette to 0
...
The FATE sample contains some pixels with value 0, but the palette
stored in the file contains only values from 16 up. Because the default
and cmdutils get_buffer() initialize the data to 0x80, they appear as
gray dots.
After this commit they change to black dots, which is probably still
incorrect but less visible and doesn't rely on get_buffer() initializing
the data.
2013-02-06 10:21:52 +01:00
Anton Khirnov
9bd6375d5f
msrledec: check bounds before constructing a possibly invalid pointer,
...
CC:libav-stable@libav.org
2013-02-06 10:21:52 +01:00
Anton Khirnov
6ed9fc44ba
svq1: replace struct svq1_frame_size with an array.
...
It is used as an array in svq1enc, so this is more correct.
2013-02-06 10:21:52 +01:00
Vladimir Pantelic
77bcb89600
vc1dec: use codec_id instead of codec_tag for VC1IMAGE
...
the rest of the code is using codec_id everywhere already
Signed-off-by: Vladimir Pantelic <vladoman@gmail.com>
Signed-off-by: Kostya Shishkov <kostya.shishkov@gmail.com>
2013-02-06 09:34:32 +01:00
Michael Niedermayer
68dfe530e0
vdpau: Rename union, avoid name conflict with vdpau
...
Fixes Ticket2203
Reviewed-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-06 01:43:36 +01:00
Luca Barbato
b2a722a87e
sh4: drop unused functions
...
{avg,put}_pixels4_c are not used.
2013-02-05 23:24:05 +01:00
Diego Biurrun
620289a20e
sh4: Fix silly type vs. variable name search and replace typo
2013-02-05 22:53:44 +01:00
Michael Niedermayer
b0635e2fcf
movtextenc: fix pointer messup and out of array accesses
...
Fixes Ticket2187
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-05 21:54:02 +01:00
Michael Niedermayer
c2dd5a18b2
ljpegenc: allocate needed scratch-buffer
...
Fixes null pointer dereference
Fixes Ticket2207
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-05 18:52:07 +01:00
Diego Biurrun
c9f933b5b6
Add av_cold attributes to arch-specific init functions
2013-02-05 17:01:05 +01:00
multiple authors
7a4885600f
libmpcodecs/vf_spp: update to latest version from mplayer
...
Please see mplayer svn for authorship and individual commits
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-05 14:53:53 +01:00
Diego Biurrun
25841dfe80
Use ptrdiff_t instead of int for {avg, put}_pixels line_size parameter.
...
This avoids SIMD-optimized functions having to sign-extend their
line size argument manually to be able to do pointer arithmetic.
2013-02-05 12:59:12 +01:00
Michael Niedermayer
5a83115130
ffv1: check for malloc failure
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-05 00:37:20 +01:00
Michael Niedermayer
b77d94dc6c
ffv1enc: check for malloc failure
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-05 00:37:20 +01:00
Michael Niedermayer
fc0d069feb
flacdec: silence several "warning: X may be used uninitialized in this function"
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-04 22:59:02 +01:00
Michael Niedermayer
96a08d8627
wmavoice: silence may be used uninitialized warnings
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-04 22:59:02 +01:00
Michael Niedermayer
63c61f0be0
vc1dec: Fix 2 "warning: may be used uninitialized in this function"
...
Initialize pointers to NULL for safety
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-04 14:30:40 +01:00
Michael Niedermayer
c67ddb56da
Merge remote-tracking branch 'mjbshaw/master'
...
* mjbshaw/master:
libopenjpegenc: make dci compliant j2c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-04 13:22:56 +01:00
Michael Niedermayer
a2bff49e26
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
mpegvideo: simplify REBASE_PICTURE
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-04 12:37:15 +01:00
Michaël Cinquin
60f06f986f
libopenjpegenc: make dci compliant j2c
...
Signed-off-by: Michael Bradshaw <mjbshaw@gmail.com>
2013-02-03 23:53:39 -07:00
Anton Khirnov
d9df93efbf
mpegvideo: simplify REBASE_PICTURE
...
Always evaluate to NULL when the source Picture is not located in the
MpegEncContext.picture array. That will only happen for
next/last_picture_ptr when updating the thread context during h264 frame
threaded decoding, where they will point to elements of ref_list. Since
ref_list is not copied during updating the context and is invalid until
it is constructed for the current slice, there is no point in doing
anything complicated with next/last_picture_ptr, as they will get
updated when the ref_list is filled.
2013-02-04 06:17:15 +01:00
Michael Niedermayer
d106679fb5
qdm2: disable superblocktype_2_3==0 code
...
The code is untested and contained bugs, we need a sample if any files
use this branch.
Suggested-by: Roberto Togni
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-03 19:59:00 +01:00
Michael Niedermayer
ccfd8cffe8
qdm2: Fix data type used in multiplication.
...
Avoid unintended truncation.
Fixes CID700555
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-03 19:56:04 +01:00
Michael Niedermayer
4d37d2bfc5
put_vp_no_rnd_pixels8_l2_mmx: fix type
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-03 17:21:06 +01:00
Michael Niedermayer
cb573f7fbc
avcodec/x86: Add daniels copyright to the recent gcc->yasm convertions he did.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-03 13:50:44 +01:00
James Almer
d1511c02f4
proresdsp: Fix checkheaders
...
It's been broken since commit ac89875
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-03 13:08:36 +01:00
Michael Niedermayer
695af8eed6
h264: skip error concealment when SPS and slices are mismatching
...
Fixes out of array accesses
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-02 21:13:25 +01:00
Michael Niedermayer
0e9b9a6748
flacdec: skip in stream header packets
...
This prevents warning messages on chained oggs with some demuxers
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-02 19:58:13 +01:00
Michael Niedermayer
cdc48860a8
h264: silence warning about array index being out of bounds
...
The index is not out of bounds, adding an assert makes gcc
realize this.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-02 16:20:19 +01:00
Ronald S. Bultje
8af915c21b
vp56: remove clear_blocks call, and clear alpha plane U/V DC only.
...
The non-alpha and alpha-Y planes are cleared in the idct_put/add()
calls. For the alpha U/V planes, we only care about the DC for entropy
context prediction purposes, the rest of the data is unused.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-01 23:51:34 +01:00
Michael Niedermayer
911e270688
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
Use proper "" quotes for local header #includes
ppc: fmtconvert: Drop two unused variables.
bink demuxer: set framerate.
Conflicts:
libavcodec/kbdwin.c
libavcodec/ppc/fmtconvert_altivec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-01 14:34:18 +01:00
Michael Niedermayer
69a6eddd60
Merge commit 'f2960097e42ddf9a356bab6547f87906f6999e0a'
...
* commit 'f2960097e42ddf9a356bab6547f87906f6999e0a':
bink: fix a check for the first frame.
doc/developer: Drop obsolete MPlayer reference
doc/developer: Add ISC license to list of acceptable licenses
doc/developer: Add web links for all suggested licenses
Conflicts:
doc/developer.texi
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-01 14:15:30 +01:00
Diego Biurrun
6c1a7d07eb
Use proper "" quotes for local header #includes
2013-02-01 12:51:15 +01:00
Diego Biurrun
4eef2ed707
ppc: fmtconvert: Drop two unused variables.
2013-02-01 12:51:13 +01:00
Anton Khirnov
f2960097e4
bink: fix a check for the first frame.
...
Packet pts is a very unreliable indicator, use
AVCodecContext.frame_number instead.
2013-02-01 12:41:31 +01:00
Michael Niedermayer
ffd02d0c19
Merge remote-tracking branch 'mjbshaw/master'
...
* mjbshaw/master:
libopenjpegenc: simplify switch statement
libopenjpegenc: add support for pix fmt gbrp (8-16 bit)
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-01 02:33:42 +01:00
Sebastian Sandberg
c6779c5131
vc1dec: fieldtx is only valid for interlaced frames
...
the fieldtx_plane is not cleared for interlaced fields
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-01 00:48:05 +01:00
Michael Bradshaw
28f36dce3e
libopenjpegenc: simplify switch statement
...
Signed-off-by: Michael Bradshaw <mjbshaw@gmail.com>
2013-01-31 16:03:58 -07:00
Michael Bradshaw
c58c67398d
libopenjpegenc: add support for pix fmt gbrp (8-16 bit)
...
Signed-off-by: Michael Bradshaw <mjbshaw@gmail.com>
2013-01-31 15:55:00 -07:00
Michael Niedermayer
131fac1c12
vc1dec: fix block_off
...
Fixes corruption of motion_val
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-31 23:22:11 +01:00
Michael Niedermayer
dd87d4a318
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
x86: hpel: Move {avg,put}_pixels16_sse2 to hpeldsp
configure: Add a comment indicating why uclibc is checked before glibc
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-31 20:03:36 +01:00
Michael Niedermayer
324498f824
Merge commit 'a65f965c04bfa27adedc0409c14cc05903f483d0'
...
* commit 'a65f965c04bfa27adedc0409c14cc05903f483d0':
mpegvideo: Do REBASE_PICTURE with byte pointers
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-31 19:19:37 +01:00
Michael Niedermayer
ed341549bb
Merge commit 'a5ba798c16d0614d982a76755fdd72b37d437170'
...
* commit 'a5ba798c16d0614d982a76755fdd72b37d437170':
dsputil: remove unused functions copy_block{2, 4, 8, 16}.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-31 19:00:29 +01:00
Diego Biurrun
52acd79165
x86: hpel: Move {avg,put}_pixels16_sse2 to hpeldsp
2013-01-31 11:19:23 +01:00
Martin Storsjö
a65f965c04
mpegvideo: Do REBASE_PICTURE with byte pointers
...
REBASE_PICTURE (more specifically, this half of it) takes a Picture
pointer that points into one larger struct, finds the offset of
that Picture within the struct and finds the corresponding field
within another instance of a similar struct.
The pointer difference "pic - (Picture*)old_ctx" is a value given
in sizeof(Picture) units, and when applied back on
(Picture*)new_ctx gets multiplied back with sizeof(Picture). Many
compilers seem to optimize out this division/multiplication, but
not all do.
GCC 4.2 on OS X doesn't seem to remove the division/multiplication,
therefore the new pointer didn't turn out to point to exactly
the right place in the new struct since it only had sizeof(Picture)
granularity (and the Picture is not aligned on a sizeof(Picture)
boundary within the encompassing struct). This bug has been present
before 47318953d
as well - with H264, pointers to h->ref_list[0][0]
pointed to 88 bytes before h->ref_list[0][0] after the rebase. After
shrinking Picture, the difference ended up even larger, making
writes via such a Picture pointer overwrite other fields at random
in H264Context, ending up in crashes later.
This fixes H264 multithreaded decoding on OS X with GCC 4.2.
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-01-31 10:51:36 +02:00
Michael Niedermayer
cdf0877bc3
h264/cabac: check loop index
...
fix out of array read
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-31 04:21:26 +01:00
Mirjana Vulin
2b6a8187a6
mips: optimization for float aac decoder (core module)
...
Signed-off-by: Mirjana Vulin <mvulin@mips.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-31 01:23:09 +01:00
Michael Niedermayer
9df9420dea
interplayvideo: Free previous frames on resolution changes.
...
Fixes out of array reads
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-31 00:46:04 +01:00
Piotr Bandurski
9c50e69385
loco: fix rgba on big-endian
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-31 00:02:17 +01:00
Michael Niedermayer
a084884b62
flashsv: clear blocks array on reallocation
...
Fixes use of uninitialized data
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-30 23:50:32 +01:00
Michael Niedermayer
984add64a4
wma: check byte_offset_bits
...
Fixes assertion failure
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-30 23:12:57 +01:00
Michael Niedermayer
4a2da83a78
dnxhddec: fix integer overflow / index check
...
Fixes out of array read
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-30 19:32:18 +01:00
Michael Niedermayer
b926cc7834
mss3: prevent AC state from becoming invalid in rac_normalise()
...
Fixes division by zero
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-30 18:14:39 +01:00
Michael Niedermayer
d2e0a276d5
msrledec: merge switches
...
More speedup and fixes 'may be used uninitialized in this function' warnings
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-30 16:42:17 +01:00
Michael Niedermayer
dbaae33c2c
msrledec: move loop into switch
...
speeds up code and allows more simplifications
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-30 16:39:35 +01:00
Michael Niedermayer
c2992b7053
msrledec: move output pointer test up
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-30 16:33:45 +01:00
Michael Niedermayer
d8a7c4958e
mpegvideo_enc: factor expression out
...
Fixes "warning: dc[0..5] may be used uninitialized in this function"
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-30 16:24:33 +01:00
Michael Niedermayer
afb4bc3d29
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
movenc: Simplify code by using avio_wb24
bfin: unbreak compilation
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-30 14:49:49 +01:00
Ronald S. Bultje
a5ba798c16
dsputil: remove unused functions copy_block{2, 4, 8, 16}.
2013-01-30 14:18:06 +01:00
Michael Niedermayer
71f8d70456
dirac/x86: fix compile without yasm
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-30 06:47:09 +01:00
Michael Niedermayer
4d3d362549
dirac/x86: fix compile without inline asm
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-30 02:51:59 +01:00
Carl Eugen Hoyos
3c3d68a976
Fix 1bpp palettized png with width not a multiple of 8.
...
Fixes ticket #2204 .
2013-01-30 00:49:16 +01:00
Michael Niedermayer
dc8dd2f6e9
sanm: Check MV before using them.
...
Fixes out of array reads
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-29 22:36:18 +01:00
Michael Niedermayer
0dfc01c2bb
huffyuvdec: Skip len==0 cases
...
Fixes vlc decoding for hypothetical files that would contain such cases.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-29 19:11:28 +01:00
Michael Niedermayer
4420b41442
huffyuvdec: check for and propagate failures from inside generate_joint_tables()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-29 18:18:51 +01:00
Michael Niedermayer
f67a0d1152
huffyuvdec: Check init_vlc() return codes.
...
Prevents out of array writes
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-29 17:57:58 +01:00
Michael Niedermayer
ebe368d5d8
ac3enc: fix 'warning: block0 may be used uninitialized in this function'
...
The pointer is also initialized to NULL for safety.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-29 16:15:02 +01:00
Luca Barbato
4e0bc996d9
bfin: unbreak compilation
...
Added a missing header file.
2013-01-29 14:59:21 +01:00
Michael Niedermayer
d1bbd304bf
Merge commit 'f81c37e40fe3236d54da12aef9cdba48ba70ec31'
...
* commit 'f81c37e40fe3236d54da12aef9cdba48ba70ec31':
vf_delogo: fix an uninitialized read.
h264: remove obsolete comment.
mpegvideo: remove some unused variables from Picture.
utvideoenc/v410enc: do not set AVFrame.reference.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-29 14:25:24 +01:00
Michael Niedermayer
3c8085dc42
Merge commit 'e6b1c3bbe7082c71ea8ee8ac83698c156c9e4838'
...
* commit 'e6b1c3bbe7082c71ea8ee8ac83698c156c9e4838':
pthread: make ff_thread_release_buffer idempotent.
mvi: set framerate
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-29 14:19:56 +01:00
Michael Niedermayer
31d8d61f59
Merge commit 'aec50f79e7460340a148a3096fe212d67edc2c64'
...
* commit 'aec50f79e7460340a148a3096fe212d67edc2c64':
rawdec: use AVPALETTE_SIZE instead of magic constants.
mimic: remove a pointless cast.
mdec: return meaningful error codes.
Conflicts:
libavcodec/rawdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-29 14:10:11 +01:00
Michael Niedermayer
f02033b98b
Merge commit 'f713411d4cfbd9c467aeda77b16ca6bc4db55d10'
...
* commit 'f713411d4cfbd9c467aeda77b16ca6bc4db55d10':
mdec: cosmetics, reformat
Conflicts:
libavcodec/mdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-29 13:57:57 +01:00
Michael Niedermayer
14aa358c20
Merge commit '098eed95bc1a6b2c8ac97f126f62bb74699670cf'
...
* commit '098eed95bc1a6b2c8ac97f126f62bb74699670cf':
mdec: merge mdec_common_init() into decode_init().
eatgv: use fixed-width types where appropriate.
x86: Simplify some arch conditionals
bfin: Separate VP3 initialization code
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-29 13:48:38 +01:00
Michael Niedermayer
8265c0f43a
Merge commit 'f550583c00e231b587d8ef98451cfbb6b6561eb6'
...
* commit 'f550583c00e231b587d8ef98451cfbb6b6561eb6':
bfin: update VP3 idct
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-29 13:40:44 +01:00
Paul B Mahol
8a6ae87b99
lavc: move deprecated audio_resample* bellow
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-01-29 11:08:39 +00:00
Anton Khirnov
76e74e4831
h264: remove obsolete comment.
2013-01-29 07:32:47 +01:00
Anton Khirnov
47318953dd
mpegvideo: remove some unused variables from Picture.
2013-01-29 07:32:36 +01:00
Anton Khirnov
231fd1ed39
utvideoenc/v410enc: do not set AVFrame.reference.
...
That field will be deprecated.
2013-01-29 07:32:21 +01:00
Anton Khirnov
e6b1c3bbe7
pthread: make ff_thread_release_buffer idempotent.
...
I.e. don't do anything on already released frames.
2013-01-29 07:32:10 +01:00
Anton Khirnov
aec50f79e7
rawdec: use AVPALETTE_SIZE instead of magic constants.
2013-01-29 07:31:43 +01:00
Anton Khirnov
e6da5d215b
mimic: remove a pointless cast.
2013-01-29 07:31:24 +01:00
Anton Khirnov
30d62507cd
mdec: return meaningful error codes.
2013-01-29 07:31:15 +01:00
Anton Khirnov
f713411d4c
mdec: cosmetics, reformat
2013-01-29 07:27:36 +01:00
Anton Khirnov
098eed95bc
mdec: merge mdec_common_init() into decode_init().
...
There is no point in keeping those two functions separate.
2013-01-29 07:27:23 +01:00
Anton Khirnov
f1c395944c
eatgv: use fixed-width types where appropriate.
2013-01-29 07:27:08 +01:00
Michael Niedermayer
11c99c78ba
h264: check the pixel format directly and force a reinit on mismatches.
...
The existing checks are insufficient to detect a pixel format
changes in case of some damaged streams.
Fixes inconsistency and later out of array accesses
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-29 04:40:04 +01:00
Piotr Bandurski
f9a8eeb08c
iff/deep: fix rle32 on big-endian
...
Fixes ticket #2197 .
Signed-off-by: Peter Ross <pross@xvid.org>
2013-01-29 11:01:19 +11:00
Diego Biurrun
c59211b437
x86: Simplify some arch conditionals
2013-01-29 00:10:53 +01:00
Paul B Mahol
9efceaf1f7
takdec: switch to init_get_bits8()
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-01-28 22:47:30 +00:00
Michael Niedermayer
3939b790f2
wmavoicedec: use the checked bitstream, reader
...
Fixes out of array reads
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-28 23:13:22 +01:00
Michael Niedermayer
14c8ee00ff
vp3dec: move threads check out of header packet type check
...
Prevents reconfiguration with threads which is unsupported
and would bring the contexts into an inconsistent state.
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-28 22:46:48 +01:00
Diego Biurrun
438ea561ad
bfin: Separate VP3 initialization code
2013-01-28 21:03:12 +01:00