- 19 Jul, 2015 15 commits
-
-
Andreas Cadhalpun authored
Signed-off-by:
Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
-
Andreas Cadhalpun authored
flcoeffs2[pos] should be the log2 of flcoeffs1[pos]. flcoeffs1[0] can be 0 here, thus flcoeffs2[pos] gets set to -inf, causing problems further down. This seems to have been copied from imc_decode_level_coefficients in commit 4eb4bb3a without updating the position. Reviewed-by:
Michael Niedermayer <michaelni@gmx.at> Signed-off-by:
Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com> (cherry picked from commit 75fd5ce4 ) Signed-off-by:
Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
-
Andreas Cadhalpun authored
It is used as get_bits argument and reading 0 bits isn't supported. Reviewed-by:
Michael Niedermayer <michaelni@gmx.at> Signed-off-by:
Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com> (cherry picked from commit 05cc8c8e ) Signed-off-by:
Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
-
Andreas Cadhalpun authored
It asserts that the frame linesize is larger than 37, but it can be smaller and decoding such frames works. Before commit cc884a35 src_stride > 7*MB_SIZE was necessary, because the blocks were interleaved in the tmp buffer and the last block was added with an offset of 6*MB_SIZE. It was changed for src_stride <= 7*MB_SIZE to write the blocks sequentially, hence the larger tmp_step. After that the assert was only necessary to make sure that the buffer remained large enough. Since commit bd2b6b33 s->scratchbuf is used as tmp buffer. As part of commit 86e107a7 the minimal scratchbuf size was increased to 256*7*MB_SIZE, which is enough for any src_stride <= 7*MB_SIZE. Also add a comment explaining the tmp_step calculation. Signed-off-by:
Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com> (cherry picked from commit 3526a120 ) Signed-off-by:
Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
-
Andreas Cadhalpun authored
The loop always needs at least 8 bytes for chunk_type and chunk_size. If fewer are left, bytestream2_get_le32 just returns 0 without reading any bytes, leading to an infinite loop. Signed-off-by:
Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com> Signed-off-by:
Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 0762152f ) Signed-off-by:
Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
-
Andreas Cadhalpun authored
More than 32 bits can't be stored in an integer and get_bits should not be used with more than 25 bits. Reviewed-by:
Paul B Mahol <onemda@gmail.com> Signed-off-by:
Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com> (cherry picked from commit d0eff885 ) Signed-off-by:
Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
-
Andreas Cadhalpun authored
If threading is used, the first (thread_count - 1) packets are read before any frame/error is returned. Counting this as successful decoding is wrong, because it also happens when no single frame could be decoded. Reviewed-by:
Michael Niedermayer <michaelni@gmx.at> Signed-off-by:
Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com> (cherry picked from commit bd0f1412 ) Signed-off-by:
Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
-
Andreas Cadhalpun authored
This is the second part of the fix for ticket #4370. Reviewed-by:
Michael Niedermayer <michaelni@gmx.at> Signed-off-by:
Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com> (cherry picked from commit cd64ead8 ) Signed-off-by:
Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com> Conflicts: ffmpeg.c
-
Andreas Cadhalpun authored
This is the first part of the fix for ticket #4370. Reviewed-by:
Michael Niedermayer <michaelni@gmx.at> Signed-off-by:
Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com> (cherry picked from commit 32a5b631 ) Signed-off-by:
Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
-
Andreas Cadhalpun authored
Reviewed-by:
Michael Niedermayer <michaelni@gmx.at> Signed-off-by:
Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com> (cherry picked from commit 9a345802 ) Signed-off-by:
Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
-
Andreas Cadhalpun authored
get_bits should not be used for more than 25 bits. Reviewed-by:
Michael Niedermayer <michaelni@gmx.at> Signed-off-by:
Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com> (cherry picked from commit f9883a66 ) Signed-off-by:
Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
-
Andreas Cadhalpun authored
Otherwise sm_size can be larger than size, which results in a negative packet size. Reviewed-by:
Michael Niedermayer <michaelni@gmx.at> Signed-off-by:
Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com> (cherry picked from commit 6b9fdf7f ) Signed-off-by:
Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
-
Andreas Cadhalpun authored
If nb_samples is zero, the bit_rate calculation results in a division by zero. Since ff_get_buffer fails if frame->nb_samples is zero, this can be fixed by moving the bit_rate calculation after that function call. That also makes it possible to reuse the already calculated frame->nb_samples value. Reviewed-by:
Michael Niedermayer <michaelni@gmx.at> Signed-off-by:
Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com> (cherry picked from commit 04dfbc94 ) Signed-off-by:
Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
-
Andreas Cadhalpun authored
get_bits should not be used with more than 25 bits. Reviewed-by:
Michael Niedermayer <michaelni@gmx.at> Signed-off-by:
Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com> (cherry picked from commit 1f1e0a29 ) Signed-off-by:
Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
-
Andreas Cadhalpun authored
This fixes a segfault when decoding multi-channel MP3onMP4 files. This is similar to commit cb72230d for MPADSPContext. Reviewed-by:
Michael Niedermayer <michaelni@gmx.at> Signed-off-by:
Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com> (cherry picked from commit 151dbe45 ) Signed-off-by:
Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
-
- 18 Jul, 2015 25 commits
-
-
Michael Niedermayer authored
Signed-off-by:
Michael Niedermayer <michael@niedermayer.cc>
-
Michael Niedermayer authored
avoids null pointer dereference Fixes: signal_sigsegv_d5de40_964_vp80-00-comprehensive-010.ivf with memlimit of 1048576 Found-by: Samuel Groß, Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by:
Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit 599d746e ) Signed-off-by:
Michael Niedermayer <michael@niedermayer.cc>
-
Michael Niedermayer authored
Fixes: signal_sigsegv_d5de23_967_vp80_00_comprehensive_010.ivf with memlimit 524288 Found-by: Samuel Groß, Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by:
Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit a84f0e8d ) Signed-off-by:
Michael Niedermayer <michael@niedermayer.cc>
-
Michael Niedermayer authored
Fixes null pointer dereference Fixes: signal_sigsegv_b02a96_280_RL_420p_ffdirac.drc with memlimit of 67108864 Found-by: Samuel Groß, Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by:
Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit 1c5b712c ) Signed-off-by:
Michael Niedermayer <michael@niedermayer.cc>
-
Michael Niedermayer authored
Avoids leaving stale pointers Fixes: signal_sigabrt_7ffff70eccc9_819_sabtriple.rm with memlimit 536870912 Found-by: Samuel Groß, Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by:
Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit 3197c0aa ) Signed-off-by:
Michael Niedermayer <michael@niedermayer.cc>
-
Michael Niedermayer authored
Fixes: signal_sigabrt_7ffff70eccc9_498_divx502.avi with memlimit 1572864 Found-by: Samuel Groß, Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by:
Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit 2ea8a480 ) Signed-off-by:
Michael Niedermayer <michael@niedermayer.cc>
-
Michael Niedermayer authored
Fixes: b4b47bc2b3fb7ca710bfffe5aa969e37_signal_sigabrt_7ffff70eccc9_744_nc_sample2.avi with memlimit of 4194304 Found-by: Samuel Groß, Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by:
Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit f1a38264 ) Signed-off-by:
Michael Niedermayer <michael@niedermayer.cc>
-
Michael Niedermayer authored
Fixes use of uninitialized memory Fixes: a96874b9466b6edc660a519c7ad47977_signal_sigsegv_7ffff713351a_744_nc_sample.avi with memlimit 2147483648 Found-by: Samuel Groß, Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by:
Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit a5d44d5c ) Signed-off-by:
Michael Niedermayer <michael@niedermayer.cc>
-
Zhang Rui authored
Signed-off-by:
Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit fcbea93c ) Signed-off-by:
Michael Niedermayer <michael@niedermayer.cc>
-
Michael Niedermayer authored
Fixes: 39a25908b84604acdaa490138282d091_signal_sigsegv_7ffff713351a_331_WAWV.avi with memlimit of 262144 Found-by: Samuel Groß, Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by:
Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit 6e80fe1e ) Signed-off-by:
Michael Niedermayer <michael@niedermayer.cc>
-
Michael Niedermayer authored
Fixes: 260813283176b57b3c9974fe284eebc3_signal_sigsegv_7ffff713351a_991_xtrem_e2_m64q15_a32sxx.3gp with memlimit of 262144 Found-by: Samuel Groß, Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by:
Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit 15629129 ) Signed-off-by:
Michael Niedermayer <michael@niedermayer.cc>
-
Michael Niedermayer authored
Fixes: 1013dbde2c360d939cc2dfc33e4f275c_signal_sigsegv_a0500f_45_320vp3.nsv with memlimit of 536870912 Found-by: Samuel Groß, Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by:
Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit fd4c87fa ) Signed-off-by:
Michael Niedermayer <michael@niedermayer.cc>
-
Michael Niedermayer authored
Fixes: 09e670595acbdafb226974b08dab66e3_signal_sigabrt_7ffff70eccc9_991_xtrem_e2_m64q15_a32sxx.3gp with memlimit of 1048576 Found-by: Samuel Groß, Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by:
Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit 503ec713 ) Signed-off-by:
Michael Niedermayer <michael@niedermayer.cc>
-
Michael Niedermayer authored
Fixes null pointer dereferences Fixes: af1a5a33e67e479f439239097bd0d4fd_signal_sigsegv_7ffff713351a_152_Dolby_Rain_Logo.pmp with memlimit of 8388608 Found-by: Samuel Groß, Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by:
Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit 5d346fea ) Signed-off-by:
Michael Niedermayer <michael@niedermayer.cc>
-
Michael Niedermayer authored
Fixes crash in 1288a2fe8e9ae6b00ca40e089d08ca65_signal_sigsegv_7ffff71426a7_354_accident.san with allocation limit 65536 Found-by: Samuel Groß, Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by:
Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit 39bbdebb ) Signed-off-by:
Michael Niedermayer <michael@niedermayer.cc>
-
Michael Niedermayer authored
Fixes: 06a4edb39ad8a9883175f9bd428334a2_signal_sigsegv_7ffff713351a_706_mov__alac__ALAC_6ch.mov Found-by: Samuel Groß, Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by:
Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit f7068bf2 ) Signed-off-by:
Michael Niedermayer <michael@niedermayer.cc>
-
Anton Khirnov authored
This prevents possible infinite loops with the calling code along the lines of while (bytestream2_get_bytes_left()) { ... }, where the reader does not advance. CC: libav-stable@libav.org (cherry picked from commit 86eee85d ) Signed-off-by:
Michael Niedermayer <michael@niedermayer.cc>
-
Michael Niedermayer authored
Fixes Assertion failure Found-by:
Andreas Cadhalpun <andreas.cadhalpun@googlemail.com> Signed-off-by:
Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 7ef6656b ) Signed-off-by:
Michael Niedermayer <michael@niedermayer.cc>
-
Michael Niedermayer authored
This ensures that no stale pointers leak through on any path Fixes: signal_sigsegv_c3097a_991_xtrem_e2_m64q15_a32sxx.3gp Found-by: Samuel Groß, Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by:
Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit b160fc29 ) Signed-off-by:
Michael Niedermayer <michaelni@gmx.at>
-
Chris Watkins authored
If init_get_bits fails the GetBitContext is invalid and must not be used. Check the return value in dirac_header and propogate the error. Signed-off-by:
Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 4f5c2e65 ) Signed-off-by:
Michael Niedermayer <michaelni@gmx.at>
-
Andreas Cadhalpun authored
Otherwise a frame with non-zero nb_samples but without any data can be returned. Reviewed-by:
Michael Niedermayer <michaelni@gmx.at> Signed-off-by:
Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com> (cherry picked from commit 42e7a5b3 ) Signed-off-by:
Michael Niedermayer <michaelni@gmx.at>
-
Andreas Cadhalpun authored
Reviewed-by:
Michael Niedermayer <michaelni@gmx.at> Signed-off-by:
Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com> (cherry picked from commit f9020d51 ) Signed-off-by:
Michael Niedermayer <michaelni@gmx.at>
-
Chris Watkins authored
When compiling libavutil/internal.h as C++11, clang warns that a space is required between a string literal and an identifier. Put spaces in concatenations of string literals and EXTERN_PREFIX. Signed-off-by:
Chris Watkins <watk@chromium.org> Signed-off-by:
Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 55e29cee ) Signed-off-by:
Michael Niedermayer <michaelni@gmx.at>
-
Michael Niedermayer authored
the later is not optimal when the buffer size is well known at allocation time This avoids a memcpy() Overall 2.5% speedup with a random 1920x1080 video Signed-off-by:
Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 47496eb9 ) Signed-off-by:
Michael Niedermayer <michaelni@gmx.at>
-
Michael Niedermayer authored
Signed-off-by:
Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 2e13a45b ) Signed-off-by:
Michael Niedermayer <michaelni@gmx.at>
-