Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/FFmpeg/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2015-07-23update changelogn2.6.4Michael Niedermayer
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-23imc: use correct position for flcoeffs2 calculationAndreas Cadhalpun
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 4eb4bb3 without updating the position. Reviewed-by: Michael Niedermayer <michaelni@gmx.at> Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com> (cherry picked from commit 75fd5ce4c1c0b2d96d71c74b650cefaaef519d27) Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com> (cherry picked from commit 27816fb9ef26af1fa820c434079491f155e67471) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-23hevc: check slice address lengthAndreas Cadhalpun
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 05cc8c8e4b7008ff3be8ec477c901b2ceca4b16b) Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com> (cherry picked from commit f06d9dced4c7267008beae45f28ce4e1848ef403) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-23snow: remove an obsolete av_assert2Andreas Cadhalpun
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 3526a120f92929cb0a4009e403ee2f141030c487) Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com> (cherry picked from commit 26cb351452e76dc4a61028f277cf11b8d7abd74b) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-23webp: fix infinite loop in webp_decode_frameAndreas Cadhalpun
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 0762152f7af6cd93bc8f504d5503723500c3f369) Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com> (cherry picked from commit 762a5878a6b0bef923ef97c15fdb8274a0351278) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-23wavpack: limit extra_bits to 32 and use get_bits_longAndreas Cadhalpun
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 d0eff8857ceff2601f85037c930cbe61a88b611e) Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com> (cherry picked from commit f0af6e705f3b30f7f5afa3c24db27433af6b1bfc) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-23ffmpeg: only count got_output/errors in decode_error_statAndreas Cadhalpun
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 bd0f14123fd8c7ff1c27b726d143f84c67f3a522) Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com> (cherry picked from commit 70b97a89d2d7ba837c830b1da5924314d68fc3e7) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-23ffmpeg: exit_on_error if decoding a packet failedAndreas Cadhalpun
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 cd64ead8d96b2d2c300e0ac620fb82b17d6051bf) Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com> Conflicts: ffmpeg.c (cherry picked from commit 1d1adf5ff42041810d4069ce03303706fbf13d8a) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-23pthread_frame: forward error codes when flushingAndreas Cadhalpun
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 32a5b631267e1f8bf279e407039b9a99d012d033) Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com> (cherry picked from commit acfad331adde5b4ae247bf5748211e8fdb6b4ef5) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-23huffyuvdec: validate image sizeAndreas Cadhalpun
Reviewed-by: Michael Niedermayer <michaelni@gmx.at> Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com> (cherry picked from commit 9a345802edf7f430b3335f486aecdd8552f8367b) Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com> (cherry picked from commit 43f8a422b34302d94ba76eb9a5be75ffffbc9881) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-23wavpack: use get_bits_long to read up to 32 bitsAndreas Cadhalpun
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 f9883a669c3df05a5c453428e080298c6511a17e) Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com> (cherry picked from commit 95bd0f3a4b65e1641079f8bbdf391d0a2bfcd27a) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-23nutdec: check maxpos in read_sm_data before returning successAndreas Cadhalpun
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 6b9fdf7f4f07926557048070cc2af3cfd0e3fe50) Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com> (cherry picked from commit eddf146ada12b394a7796af12bff2121505dc4a1) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-23vc1dec: use get_bits_long and limit the read bits to 32Andreas Cadhalpun
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 1f1e0a2971b2a01f275bb5088c2e36166514be64) Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com> (cherry picked from commit 2e1226a695dd2faada939e0bdc3ee166b05c3579) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-23mpegaudiodec: copy AVFloatDSPContext from first context to all contextsAndreas Cadhalpun
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 151dbe4579601a81662b4b366d0e10df3c00027a) Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com> (cherry picked from commit f66d2bf94909904109f6b0609516c10f9f3f3db4) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-20Update for 2.6.4Michael Niedermayer
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-20avcodec/vp8: Check buffer size in vp8_decode_frame_header()Michael Niedermayer
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 599d746e07319dc792ed2e511b666fe482f1ff88) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-20avcodec/vp8: Fix null pointer dereference in ff_vp8_decode_free()Michael Niedermayer
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 a84f0e8d8f293df3c535f9b893730a835bed6520) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-20avcodec/diracdec: Check for hpel_base allocation failureMichael Niedermayer
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 1c5b712c0a643a039d6f34269b4102de313a050a) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-20avcodec/rv34: Clear pointers in ff_rv34_decode_init_thread_copy()Michael Niedermayer
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 3197c0aa87a3b7190e17d49e6fbc7b554e4b3f0a) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-20avfilter/af_aresample: Check ff_all_* for allocation failuresMichael Niedermayer
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 2ea8a480832acad3095783bcb11d5f290bec56cf) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-20avcodec/pthread_frame: clear priv_data, avoid stale pointer in error caseMichael Niedermayer
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 f1a38264f20382731cf2cc75fdd98f4c9a84a626) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-20swscale/utils: Clear pix buffersMichael Niedermayer
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 a5d44d5c220e12ca0cb7a4eceb0f74759cb13111) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-20avutil/fifo: Fix the case where func() returns less bytes than requested in ↵Zhang Rui
av_fifo_generic_write() Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit fcbea93cf8777bbef2a393d26942b5d3c70a448d) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-20ffmpeg: Fix cleanup after failed allocation of output_filesMichael Niedermayer
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 6e80fe1ecd984a59bb6c73cbb436cc06536b7728) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-20avformat/mov: Fix deallocation when MOVStreamContext failed to allocateMichael Niedermayer
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 15629129dde771446a005282ee33c4ea1199e696) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-20ffmpeg: Fix crash with ost->last_frame allocation failureMichael Niedermayer
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 fd4c87fa3becaf8a6c480db915daf51e297b76c5) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-20ffmpeg: Fix cleanup with ost = NULLMichael Niedermayer
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 503ec7139f887bf8ed8d57da07ce93c4e88447a6) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-20avcodec/pthread_frame: check avctx on deallocationMichael Niedermayer
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 5d346feafa817c4fbc30f7ed0b93b2dad6cef15b) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-20avcodec/sanm: Reset sizes in destroy_buffers()Michael Niedermayer
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 39bbdebb1ed8eb9c9b0cd6db85afde6ba89d86e4) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-20avcodec/alac: Clear pointers in allocate_buffers()Michael Niedermayer
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 f7068bf277a37479aecde2832208d820682b35e6) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-20bytestream2: set the reader to the end when reading more than availableAnton Khirnov
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 86eee85daddb682fa072c2e2657c90a514b855e3) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-20avcodec/utils: use a minimum 32pixel width in avcodec_align_dimensions2() ↵Michael Niedermayer
for H.264 Fixes Assertion failure Found-by: Andreas Cadhalpun <andreas.cadhalpun@googlemail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 7ef6656b1e5bfbc7499013d3b38b093b6b2f31ec) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-20avcodec/mpegvideo: Clear pointers in ff_mpv_common_init()Michael Niedermayer
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 b160fc290cf49b516c5b6ee0730fd9da7fc623b1) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-07-20oggparsedirac: check return value of init_get_bitsChris Watkins
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 4f5c2e651a95b950f6a3fb36f2342cbc32515f17) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-07-20wmalosslessdec: reset frame->nb_samples on packet lossAndreas Cadhalpun
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 42e7a5b3c704985c2c18970cc94a837b413df9d9) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-07-20wmalosslessdec: avoid reading 0 bits with get_bitsAndreas Cadhalpun
Reviewed-by: Michael Niedermayer <michaelni@gmx.at> Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com> (cherry picked from commit f9020d514e9ed5043496a710b36daba1ab182e97) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-07-20avcodec/rawenc: Use ff_alloc_packet() instead of ff_alloc_packet2()Michael Niedermayer
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 47496eb97cff8130991313d1b7292613620d8592) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-07-20avcodec/aacsbr: Assert that bs_num_env is positiveMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 2e13a45b1a9a69456631e582bbb06954d169eb55) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-07-20avcodec/aacsbr: check that the element type matches before applying SBRMichael Niedermayer
Fixes out of array access Fixes: signal_sigsegv_3670fc0_2818_cov_2307326154_moon.mux Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 79a98294da6cd85f8c86b34764c5e0c43b09eea3) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-07-20avcodec/h264_slice: Use w/h from the AVFrame instead of mb_w/hMichael Niedermayer
Fixes out of array access Fixes: asan_heap-oob_4d5bb0_682_cov_3124593265_Fraunhofer__a_driving_force_in_innovation__small.mp4 Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 330863c9f19a23c500ba7901a23f1cc377b353bb) Conflicts: libavcodec/h264_slice.c
2015-07-20vp9/update_prob: prevent out of bounds table readJames Zern
the max value of the lookup in expanded form is: (((1 << 7) - 1) << 1) - 65 + 1 + 64 = 254 add one entry of padding to inv_map_table[] to prevent out of bounds access with non-conforming / fuzzed bitstreams Signed-off-by: James Zern <jzern@google.com> Reviewed-by: "Ronald S. Bultje" <rsbultje@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit e91f860ea74e11e9178500fe8794c47f57dbf48c) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-07-20avfilter/vf_transpose: Fix rounding errorMichael Niedermayer
Fixes out of array access Fixes: asan_heap-oob_7f875d_3482_cov_1818465256_ssudec.mov Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 0083c16605aa5997534e87e68f97ef85a8c3b7b8) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-07-20avcodec/pngdec: Check values before updating context in decode_fctl_chunk()Michael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit b54ac8403bfea4e7fab0799ccfe728ba76959a38) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-07-20avcodec/pngdec: Require a IHDR chunk before fctlMichael Niedermayer
This is required by the APNG spec Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit a1736926e9ae51706b537776722e816a4d1f6b36) Conflicts: libavcodec/pngdec.c
2015-07-20avcodec/pngdec: Only allow one IHDR chunkMichael Niedermayer
Multiple IHDR chunks are forbidden in PNG Fixes inconsistency and out of array accesses Fixes: asan_heap-oob_4d5c5a_1738_cov_2638287726_c-m2-8f2b481b7fd9bd745e620b7c01a18df2.png Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 47f4e2d8960ca756ca153ab8e3e93d80449b8c91) Conflicts: libavcodec/pngdec.c Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-07-20wmavoice: limit wmavoice_decode_packet return value to packet sizeAndreas Cadhalpun
Claiming to have decoded more bytes than the packet size is wrong. Reviewed-by: Michael Niedermayer <michaelni@gmx.at> Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com> (cherry picked from commit 2a4700a4f03280fa8ba4fc0f8a9987bb550f0d1e) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-07-20swscale/swscale_unscaled: Fix rounding difference with RGBA output between ↵Michael Niedermayer
little and big endian Fixes fate/dds-rgb16 on big endian Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit f6ab967eae497733f6adc12b30075980fd6eea98) Conflicts: tests/ref/fate/dds-rgb16
2015-07-20ffmpeg: Do not use the data/size of a bitstream filter after failureMichael Niedermayer
Found-by: Rodger Combs Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 8f0f678f090d9939b0014ba85641e2cb83d39cb8) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-07-20swscale/x86/rgb2rgb_template: fix signedness of v in ↵James Almer
shuffle_bytes_2103_{mmx,mmxext} Reviewed-by: Michael Niedermayer <michaelni@gmx.at> Signed-off-by: James Almer <jamrial@gmail.com> (cherry picked from commit e22edbfd413242dda720dc5191fc00a51c24d74c) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-07-20swscale/x86/rgb2rgb_template: add missing xmm clobbersJames Almer
Reviewed-by: Michael Niedermayer <michaelni@gmx.at> Signed-off-by: James Almer <jamrial@gmail.com> (cherry picked from commit 910eeab48026060b5f7780b2560445c069eb4d6b) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-13 10:17:26 +0300