highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
31,549 Commits 36 Branches 392 Tags
Commit Graph

31549 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Stefano Sabatini
d155fdefb8 vf_unsharp: fix out-of-buffer read 
In apply_unsharp(), when y is >= height, prevent out-of-buffer reading
from src, read from the last buffer line in src2 instead.

The check was implemented in the original unsharp libmpcodecs code and
lost in the port.

This also fixes output discrepancy between the two filters.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
(cherry picked from commit 998e8519efbc772994c5ba19c0d39573998be9db)
 2011-10-01 20:51:43 +02:00
Laurent Aimar
d414c77ded Check for unsupported parameters in ff_j2k_dwt_init() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit b4483a531a139f304f4370f470325facb107202f)
 2011-10-01 20:51:35 +02:00
Laurent Aimar
dc9b708f4d Check for out of bound reads in jpeg 2000 decoder. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 02660a871301adada14b0e0fe64c66f73c2e4541)
 2011-10-01 20:51:28 +02:00
Laurent Aimar
f8eabfc16e Prevent calling init_vlc() with invalid parameters in motionpixels decoder. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 41b7389cade702383e59343561776f83bb26e17f)
 2011-10-01 20:51:17 +02:00
Laurent Aimar
14617fa7b8 Prevent NULL dereference when the palette is missing in the xan decoder. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 56ee5a9ad1b385129c40ba4773f99bc5943ae8af)
 2011-10-01 20:51:12 +02:00
Laurent Aimar
485b4317bb Fixed out of bound accesses in xan_unpack() of the xan decoder. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 5279141c1d7a72c467b7e0666fc2275cbcec4668)
 2011-10-01 20:51:08 +02:00
Nicolas George
17b6abab50 movenc: Replace av_realloc by av_realloc_f when relevant. 
Signed-off-by: Nicolas George <nicolas.george@normalesup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 194c2432eecd97c36914956f3bf7781ac4fc6f3d)
 2011-10-01 20:50:19 +02:00
Nicolas George
cfff8db729 gxfenc: Replace av_realloc by av_realloc_f when relevant. 
Signed-off-by: Nicolas George <nicolas.george@normalesup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit af84d9bb9e8a69a715fc7596d6cbaa00ad00dc29)
 2011-10-01 20:50:08 +02:00
Nicolas George
431937883f aviobuf: Replace av_realloc by av_realloc_f when relevant. 
Signed-off-by: Nicolas George <nicolas.george@normalesup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 247a1dc84716cb033b538a5bd5ba8b33de0e8260)
 2011-10-01 20:50:02 +02:00
Nicolas George
7bc9c32573 avienc: Replace av_realloc by av_realloc_f when relevant. 
Signed-off-by: Nicolas George <nicolas.george@normalesup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit e47cfe9e5c10eee3c8d0b6aff81792c0f10e66e1)
 2011-10-01 20:49:55 +02:00
Nicolas George
1537f86a93 avidec: Replace av_realloc by av_realloc_f when relevant. 
Signed-off-by: Nicolas George <nicolas.george@normalesup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 71e23d39a396f45bbdf258735b02a4bd5e25fd49)
 2011-10-01 20:49:48 +02:00
Nicolas George
2a934e87b1 4xm: Replace av_realloc by av_realloc_f when relevant. 
Signed-off-by: Nicolas George <nicolas.george@normalesup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 0cc44facf17153454727c26f2f40ee2f77b90df5)
 2011-10-01 20:49:41 +02:00
Nicolas George
acfe2c9154 libvpxenc: Replace av_realloc by av_realloc_f when relevant. 
Signed-off-by: Nicolas George <nicolas.george@normalesup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 769298a6869c3b16557280a63f6502409d1b5e49)
 2011-10-01 20:49:34 +02:00
Nicolas George
bbb191c721 bitstream: Replace av_realloc by av_realloc_f when relevant. 
Signed-off-by: Nicolas George <nicolas.george@normalesup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 198ed6474d603f930430067b8b56955d443e821c)
 2011-10-01 20:49:26 +02:00
Nicolas George
a75b5a89d1 Introduce av_realloc_f. 
av_realloc_f helps avoiding memory-leaks in typical uses of realloc.

Signed-off-by: Nicolas George <nicolas.george@normalesup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 5cd754bca290775ec2dbbf88597ab58e0482efca)
 2011-10-01 20:48:59 +02:00
Nicolas George
651e21f584 Introduce av_size_mult. 
av_size_mult helps checking for overflow when computing the size of a memory
area.

Signed-off-by: Nicolas George <nicolas.george@normalesup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit b2600509fef4d77645491f208b8113c372a32110)
 2011-10-01 20:48:53 +02:00
Laurent Aimar
fa816e01f4 Check for out of bound reads in the flic decoder. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 1f024b882094b26c85e87698faa002b8713b5f88)
 2011-10-01 20:47:42 +02:00
Laurent Aimar
03a4b489f1 Prevent out of bound accesses in the xan decoder. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit feca3ba053499e0d38f48910cef9bc431036956f)
 2011-10-01 20:44:51 +02:00
Laurent Aimar
df0d418ce0 Check for invalid/corrupted bitstream in sun raster decoder. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit b9596a503760ccbd82ca3c03d1c0d5b9449be12b)
 2011-10-01 20:44:46 +02:00
Laurent Aimar
6b0565e5b8 Prevent NULL dereferences when missing the reference frame in the xan decoder. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 19e95b88459e879d3e67a66350d937c32ed762ca)
 2011-10-01 20:44:40 +02:00
Laurent Aimar
23197f5467 Check for out of bounds reads in sun rasterfile decoder. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 039f3c33fffd2f4ae376b662ea4ec67c1d6a4c04)
 2011-10-01 20:44:35 +02:00
Laurent Aimar
0a5e269f03 Check for corrupted extra data in wmavoice decoder. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 61930119cbff7572ebe7ade6cd9268becbec37f4)
 2011-10-01 20:44:30 +02:00
Laurent Aimar
70727e16ca Check for out of bound writes in the wmavoice decoder. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit e09ae22ab7d9af7f1cbfd2445fa71ad9e7c28ee3)
 2011-10-01 20:44:25 +02:00
Laurent Aimar
08decaeb95 Prevent NULL dereferences when missing the reference frame in the bink decoder. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 66aae97a60fcd8658f18c484b5af898a48d0e3f9)
 2011-10-01 20:44:19 +02:00
Laurent Aimar
1860053820 Check for out of bound writes when building tree in bink decoder. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 254af56dd101bc756194dd080bb99e8f123500dd)
 2011-10-01 20:39:17 +02:00
Laurent Aimar
184a156f7a Check for various out of bound writes in the bink decoder. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 36bf135d4c32973933000a819208df7da9dd3e16)
 2011-10-01 20:39:06 +02:00
Laurent Aimar
9851184d30 Reset internal state on corrupted blocks in wavpack decoder. 
wavpack_decode_block() supposes that it is called back with the exact
same buffer unless it has returned with an error. With multi-channels
files, wavpack_decode_frame() was breaking this assumption.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit c2a016ad4d9c29285813ba5806189e63e063e0fb)
 2011-10-01 20:38:43 +02:00
Laurent Aimar
9770127cd8 Validate the number of audio channels before using it in wmapro decoder. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit fc64434030a8e214fed4179733e49026e7550da5)
 2011-10-01 20:38:33 +02:00
Justin Ruggles
857c7e122b ws_snd: make sure number of channels is 1 
(cherry picked from commit 6a818cb3ff2056d43361e5fd09e318cd2ca2a7b4)
 2011-10-01 20:38:11 +02:00
Justin Ruggles
915b905a1b ws_snd: add some checks to prevent buffer overread or overwrite. 
(cherry picked from commit 417364ce1f979031ef6fee661fc15e1869bdb1b4)
 2011-10-01 20:37:36 +02:00
Justin Ruggles
4db466db97 ws_snd: decode to AV_SAMPLE_FMT_U8 instead of S16. 
8-bit unsigned is the native sample format.
(cherry picked from commit 2322ced8da990835717a176b8d2c32961cfecd3e)
 2011-10-01 20:37:34 +02:00
Justin Ruggles
20047f77b9 flacdec: fix buffer size checking in get_metadata_size() 
Adds an additional check before reading the next block header and avoids a
potential integer overflow when checking the metadata size against the
remaining buffer size.
(cherry picked from commit 4c5e7b27d57dd2be777780e840eef9be63242158)
 2011-10-01 20:33:34 +02:00
Mike Scheutzow
7e362df304 Fix a buffer overflow in libx264 interface to x264 encoder. Previous code ignored the compressed buffer size passed in. This change returns as many complete NALs as can fit in the buffer, and logs an error message. 
Signed-off-by: Mike Scheutzow <mike.scheutzow@alcatel-lucent.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit e2dae1faa84ada5746ac2114de7eb68abd824131)
 2011-10-01 20:32:25 +02:00
tipok
be1ae17ec0 libaac+ support 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-10-01 20:32:22 +02:00
Laurent Aimar
cdb72c827c Check for out of bound bands limit in mpc v8 decoder. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 508e47a5751b063e5b3d1d6aceda8a19ad8b1d37)
 2011-10-01 20:30:43 +02:00
Laurent Aimar
521dbccc11 Fix return value on EOF in mpc v8 demuxer. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 7ec5ea437fc88ca58d7ac3cd12dfa2f0fbd4011f)
 2011-10-01 20:30:35 +02:00
Alexander Strasser
7aa24b157d h264: ff_h264_decode_extradata: check buffer args 
The buffer size and pointer were not checked prior to testing the first
byte of the buffer. These were sometimes checked before calling, but it is
better to add it inside the function as it takes buf and size arguments.

Signed-off-by: Alexander Strasser <eclipse7@gmx.net>
(cherry picked from commit 715f259bf949b06df1b5ed0307606dc258754c99)
 2011-10-01 20:29:07 +02:00
Reimar Döffinger
02affe2f0e Compile x86/swscale_template with -mno-red-zone. 
Replaces a very hackish hack to fix the same issue (call instruction
overwriting stack variables).

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
(cherry picked from commit 424bcc46b5fb0d662e0fb9ad6319c5b9ef3d770f)
 2011-10-01 20:28:12 +02:00
Michael Niedermayer
6109974cd9 ffmpeg: increase bit_buffer_size, the header size is clearly too small for rgb48 raw based formats 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit d8289ff9a9a3d0af416e70a1c864e1c6ce095656)
 2011-10-01 20:27:48 +02:00
Laurent Aimar
5681d74aaf Add av_calloc() helper. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit ccecab4a0d7f3f4f296551c2e22bbf12af7d14e8)
 2011-10-01 20:25:28 +02:00
Laurent Aimar
1b26a734b2 Fix potential pointer arithmetic overflows in rle_unpack() of vmd video decoder. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 35cb6854bb76b4a5b6f2aea2dce81e18d7ab61cd)
 2011-10-01 20:25:21 +02:00
Laurent Aimar
02bdeff1ef Fix out of bound reads in rle_unpack() of vmd video decoder. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 4749e074987d45cb98935a683a7ee8e1ee376d86)
 2011-10-01 20:25:16 +02:00
Laurent Aimar
55efeba2b5 Check for out of bound reads in vmd_decode() of vmd video decoder. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit e07377e7366d038d6f28792c46745463a0542650)
 2011-10-01 20:25:10 +02:00
Laurent Aimar
08657a2a8a Fix potential pointer arithmetic overflows in lz_unpack of vmd video decoder. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 78cb39d2b2ad731dd3b984b0c0711b9f1d6de004)
 2011-10-01 20:24:57 +02:00
Laurent Aimar
f40b04e917 Prevent out of bound read in lz_unpack in vmd video decoder. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 5127f465bd3e2cf9cbf66dea3cf7b481b522d266)
 2011-10-01 20:24:52 +02:00
Laurent Aimar
d92bfc98f9 Prevent NULL dereferences when the previous frame is missing in vmd video decoder. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 6a6383bebcb03a785797007031ad1c9786a508a5)
 2011-10-01 20:24:46 +02:00
Laurent Aimar
1ed90c84f6 Check for invalid update parameters in vmd video decoder. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit e7aed1280ea14b60fceae04d71dfd03e1daf2d04)
 2011-10-01 20:24:39 +02:00
Laurent Aimar
21c9d92646 Fix potential overread in vmd audio decoder. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 00cbe9e4053fd562b6f21e76aca6636ff926b637)
 2011-10-01 20:24:31 +02:00
Laurent Aimar
be22dc60f5 vp56:Fix error recovery code on size changes in vp5/6 decoder 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 1aad9cd9d26adcca1d398a4cb3d67f89a6fa8967)
 2011-10-01 20:23:03 +02:00
Laurent Aimar
35f8ad420a vp6:Reset the internal state when aborting key frames header parsing in vp6 decoder. 
It prevents leaving the state only half initialized.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 91f104496bb7632ed5ff03798e06dd8af014f0d9)
 2011-10-01 20:22:52 +02:00