summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* avformat/utils: Ensure that AVFMT_FLAG_CUSTOM_IO is set before useMichael Niedermayer2015-06-101-0/+3
| | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit ba631b791435c395361e2026fc7419b341e57813) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* alsdec: validate time diff indexAndreas Cadhalpun2015-06-101-0/+8
| | | | | | | | | | | | | If begin is smaller than t, the subtraction 'begin -= t' wraps around, because begin is unsigned. The same applies for end < t. This causes segmentation faults. Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit faf9fe2c224ea81a98afd53e2f0be0a2e13aeca9) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avcodec/alsdec: Use av_mallocz_array() for chan_data to ensure the arrays ↵Michael Niedermayer2015-06-101-2/+2
| | | | | | | | | | | never contain random data Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 7e104647a3556fc61a139483cee1cb7dfa2dc5bd) Conflicts: libavcodec/alsdec.c
* alsdec: ensure channel reordering is reversibleAndreas Cadhalpun2015-06-101-1/+5
| | | | | | | | | | | | | If the same idx is used for more than one i, at least one entry in sconf->chan_pos remains uninitialized. This can cause segmentation faults. Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit ef16501aebed43e34a3721336e8bee732eca2877) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* ac3: validate end in ff_ac3_bit_alloc_calc_maskAndreas Cadhalpun2015-06-101-0/+3
| | | | | | | | | | | | | | This fixes an invalid read if end is 0: band_end = ff_ac3_bin_to_band_tab[end-1] + 1; Depending on what is before the array, this can cause stack smashing, when band_end becomes too large. Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit bc4fee7f2a51635fa3c0f61d1e5164da1efeded3) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* aacpsy: avoid psy_band->threshold becoming NaNAndreas Cadhalpun2015-06-101-1/+4
| | | | | | | | | | | | | | | | | If band->thr is 0.0f, the division is undefined, making norm_fac not a number or infinity, which causes psy_band->threshold to become NaN. This is passed on to other variables until it finally reaches sce->sf_idx and is converted to an integer (-2147483648). This causes a segmentation fault when it is used as array index. Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com> Reviewed-by: Claudio Freire <klaussfreire@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit e224aa41917454e7b5c23d9f2541425743ce595a) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* aasc: return correct buffer size from aasc_decode_frameAndreas Cadhalpun2015-06-101-1/+1
| | | | | | | | Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 0be54ad280cf114c02306b7063147e8379f8ed1e) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* msrledec: use signed pixel_ptr in msrle_decode_pal4Andreas Cadhalpun2015-06-101-1/+1
| | | | | | | | | | | | | | | | This fixes segmentation faults, when pic->linesize[0] is negative. In that case 'line * pic->linesize[0] + pixel_ptr' is treated as unsigned and wraps around. This reverts commit 7d78a964. The problem was introduced in commit f7e1367f, which should obsolete that commit. Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit ae6fd7300b4e9f81d3b5ba201096ffe7cccf26fb) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avcodec/aacdec: Fix storing state before PCE decodeMichael Niedermayer2015-06-101-1/+1
| | | | | | | | | Fixes Ticket4460 Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit e88b3852aefaa39b2170ef185ad03dda18732821) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* tests: Fix test name for pixfmts tests(cherry picked from commit ↵Timothy Gu2015-06-101-0/+2
| | | | | | e1ee0521a698809ed216e9e5c11bd2bbb466ed04) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* tests/fate.sh: report different status for different errorsTimothy Gu2015-06-101-3/+3
| | | | | | | | | The order of error codes will be useful in my future fateserver patches. Signed-off-by: Timothy Gu <timothygu99@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit cc0057a31c7097839f9c4e4da61e2933b5b0e055) Signed-off-by: Timothy Gu <timothygu99@gmail.com>
* avcodec/h264_refs: Do not set reference to things which dont existMichael Niedermayer2015-06-101-1/+1
| | | | | | | | | | | Fixes deadlock Fixes Ticket4428 Fixes Ticket4429 Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 429de043202286a2b5bcc082cc02de860b734db2) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avutil/pca: Check for av_malloc* failuresMichael Niedermayer2015-06-101-0/+8
| | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit dadc43eee4d9036aa532665a04720238cc15e922) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avcodec/msrledec: restructure msrle_decode_pal4() based on the line number ↵Michael Niedermayer2015-06-101-14/+11
| | | | | | | | | | | | | instead of the pixel pointer Fixes out of array access Fixes: da14e86d8462be6493eab16bc2d40f88/asan_heap-oob_204cfd2_528_cov_340150052_COMPRESS.BMP Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit f7e1367f58263593e6cee3c282f7277d7ee9d553) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avcodec/dnxhddec: Check that the frame is interlaced before using cur_fieldMichael Niedermayer2015-06-101-1/+1
| | | | | | | | | Fixes Ticket4227 Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 2c660e34cf3c2b77cd2bef6f292920334dfd9192) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avformat/mov: Disallow ".." in dref unless use_absolute_path is setMichael Niedermayer2015-06-101-0/+3
| | | | | | | | | | | as this kind of allows to circumvent it to some extend. We also could add a separate parameter or value to choose this Found-by: ramiro Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 1e4d0498df6621143da1a550006ddc3526ad51cb) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avformat/mov: Check for string truncation in mov_open_dref()Michael Niedermayer2015-06-101-1/+3
| | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 8003816e1619e77d8de051883264aa090e0d78cc) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avformat/mov: Use sizeof(filename) instead of a literal numberMichael Niedermayer2015-06-101-2/+2
| | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 21a53dd08dce7cc5b3fdf9c4826b4b74d8300ea0) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* ffmdec: make sure the time base is validAndreas Cadhalpun2015-06-101-0/+10
| | | | | | | | | | | | | | | A negative time base can trigger assertions. Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 4c91d81be23ffacfa3897b2bcfa77445bb0c2f89) Conflicts: libavformat/ffmdec.c (cherry picked from commit 9678ceb6976ca8194848b24535785a298521211f) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avcodec/012v: redesign main loopMichael Niedermayer2015-06-101-43/+39
| | | | | | | | | | | | Fixes out of array accesses Fixes: ffmpeg_012v_crash.ts Found-by: Thomas Lindroth <thomas.lindroth@gmail.com> Reviewed-by: Thomas Lindroth <thomas.lindroth@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 48df30d36c3ca360c407d84f96749888d1fbe853) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avcodec/012v: Check dimensions more completelyMichael Niedermayer2015-06-101-2/+2
| | | | | | | | | | Fixes division by 0 Found-by: Thomas Lindroth <thomas.lindroth@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit d3b25383daffac154846daeb4e4fb46569e728db) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* arm: Suppress tags about used cpu arch and extensionsMartin Storsjö2015-06-102-0/+12
| | | | | | | | | | | | | | | | When all the codepaths using manually set .arch/.fpu code is behind runtime detection, the elf attributes should be suppressed. This allows tools to know that the final built binary doesn't strictly require these extensions. Signed-off-by: Martin Storsjö <martin@martin.st> (cherry picked from commit dcae2e32f7d8a1ca5fb8c1e4aa81313be854dd73 and b77e335e441040a40fc6156b8e4a134745d10233) Signed-off-by: Martin Storsjö <martin@martin.st> (cherry picked from commit 9841654c158c80e9d525ba03754135d3f34e306e) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Fix read-after-free in matroska_read_seek().Xiaohan Wang2015-06-101-1/+2
| | | | | | | | | | | | | | | | | | | | In matroska_read_seek(), |tracks| is assigned at the begining of the function. However, functions like matroska_parse_cues() could reallocate the tracks so that |tracks| can get invalidated. This CL assigns |tracks| only before we use it so that it won't be invalidated. BUG=427266 TEST=Test case in associated bug passes now. Change-Id: I9c7065fe8f4311ca846076281df2282d190ed344 Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 33301f001747d7a542073c634cc81da5eff051cf) Conflicts: libavformat/matroskadec.c
* roqvideoenc: set enc->avctx in roq_encode_initAndreas Cadhalpun2015-06-101-0/+2
| | | | | | | | | | | | | So far it is only set in roq_encode_frame, but it is used in roq_encode_end to free the coded_frame. This currently segfaults if roq_encode_frame is not called between roq_encode_init and roq_encode_end. Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit cf82c426fadf90105e1fb9d5ecd267cc3aa2b288) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avcodec/options_table: remove extradata_size from the AVOptions tableMichael Niedermayer2015-06-101-1/+0
| | | | | | | | | | | | | allowing access to the size but not the extradata itself is not useful and could lead to potential problems if writing happens through this field Reviewed-by: Andreas Cadhalpun <andreas.cadhalpun@googlemail.com> Reviewed-by: Lukasz Marek <lukasz.m.luki2@gmail.com> Reviewed-by: Nicolas George <george@nsup.org> Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 1f4088b28540080ce1d42345c5614be3e1a6a197) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* ffmdec: limit the backward seek to the last resync positionAndreas Cadhalpun2015-06-101-2/+7
| | | | | | | | | | | | | If resyncing leads to the same position as previously, it will again lead to a resync attempt, resulting in an infinite loop. Thus don't seek back beyond the last syncpoint. Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 6b8263b03ab3d16d70525ae1893cb106be7852f1) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* ffmdec: fix infinite loop at EOFAndreas Cadhalpun2015-06-101-2/+2
| | | | | | | | | | | If EOF is reached, while skipping bytes, avio_tell(pb) won't change anymore, resulting in an infinite loop. Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 6fa98822eba501a4898fdec5b75acd3026201005) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avformat/rm: limit packet sizeAndreas Cadhalpun2015-06-101-0/+5
| | | | | | | | | | | | | | | | | | The chunk size is limited to 0xFFFF (written by avio_wb16), so make sure that the packet size is not too large. Such large frames need to be split into slices smaller than 64 kB, but that is currently supported neither by the rv10/rv20 encoders nor the rm muxer. Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com> See Ticket244 Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 08728f400b8367dc8c983036cb2eff3a2891322b) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avcodec/rv10: check size of s->mb_width * s->mb_heightAndreas Cadhalpun2015-06-103-4/+12
| | | | | | | | | | If it doesn't fit into 12 bits it triggers an assertion. Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 2578a546183da09d49d5bba8ab5e982dece1dede) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* mdec: check for out of bounds readFederico Tomassetti2015-06-101-7/+13
| | | | | | | | | | Bug-Id: CID 1257501 CC: libav-stable@libav.org Signed-off-by: Luca Barbato <lu_zero@gentoo.org> (cherry picked from commit 2c63081b48d98f3a0d0bed7b0ec3c0347b99144c) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* aic: Fix decoding files with odd dimensionsVittorio Giovara2015-06-101-2/+2
| | | | | | | | | | | | Normally the aic decoder finds the proper slice combination (multiple of some number less than 32) but in case of odd width, it resorts to the default values, which were actually swapped. The number of slices is modified to account for such odd width cases. CC: libav-stable@libav.org (cherry picked from commit e878ec0d47cd6228c367b2f3128b76d7523f7255) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avcodec/tiff: move bpp check to after "end:"Michael Niedermayer2015-06-101-7/+7
| | | | | | | | | | | This ensures that all current and future code-pathes get bpp checked Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit d5e9fc782150d4596c72440a0aa02b7f4f1254b1) Conflicts: libavcodec/tiff.c
* avcodec/utils: Align YUV411 by as much as the other YUV variantsMichael Niedermayer2015-06-101-1/+1
| | | | | | | | | | | | Fixes out of array accesses Fixes: ffmpeg_mjpeg_crash2.avi Found-by: Thomas Lindroth <thomas.lindroth@gmail.com> Tested-by: Thomas Lindroth <thomas.lindroth@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit e3201c38d53d2b8b24d0bc95d726b2cb1752dc12) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avformat/flvenc: check that the codec_tag fits in the available bitsAndreas Cadhalpun2015-06-101-1/+1
| | | | | | | | | | flags is later written with avio_w8 and if it doesn't fit in one byte it triggers an av_assert2. Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit e8565d21c276ab9ac5ce785549420321fbd0b093) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* swscale/utils: clear formatConvBuffer on allocationMichael Niedermayer2015-06-101-1/+1
| | | | | | | | | | | Fixes use of uninitialized memory Fixes: asan_heap-oob_35ca682_1474_cov_3230122439_aletrek_tga_16bit.mov Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 007498fc1a639ecee2cda1892cbcff66c7c8c951) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avformat/bit: only accept the g729 codec and 1 channelAndreas Cadhalpun2015-06-101-2/+6
| | | | | | | | | | Other codecs/channel numbers are not supported by this muxer. Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit d0b8640f75ff7569c98d6fdb03d83451104e088c) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avformat/bit: check that pkt->size is 10 in write_packetAndreas Cadhalpun2015-06-101-0/+3
| | | | | | | | | | | | Ohter packet sizes are not supported by this muxer. This avoids a null pointer dereference of pkt->data. Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit eeda2c3de8a8484d9e7d1e47ac836bec850b31fc) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avformat/adxdec: check avctx->channels for invalid valuesAndreas Cadhalpun2015-06-101-0/+5
| | | | | | | | | | This avoids a null pointer dereference of pkt->data. Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 7faa40af982960608b117e20fec999b48011e5e0) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Fix buffer_size argument to init_put_bits() in multiple encoders.Dyami Caliri2015-06-109-10/+10
| | | | | | | | | | | | Several encoders were multiplying the buffer size by 8, in order to get a bit size. However, the buffer_size argument is for the byte size of the buffer. We had experienced crashes encoding prores (Anatoliy) at size 4096x4096. (cherry picked from commit 50833c9f7b4e1922197a8955669f8ab3589c8cef) Conflicts: libavcodec/proresenc_kostya.c
* mips/acelp_filters: fix incorrect register constraintJames Cowgill2015-06-101-1/+1
| | | | | | | | | | | | | Change register constraint on the v variable from = to +. This was causing GCC to think that the v variable was never read and therefore not initialize it. This fixes about 20 fate failures on mips64el. Signed-off-by: James Cowgill <james410@cowgill.org.uk> Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit b9de1303a6414174ab2f3bccefa801bfabcf0f88) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avcodec/zmbv: Check len before reading in decode_frame()Michael Niedermayer2015-06-101-0/+5
| | | | | | | | | | | Fixes out of array read Fixes: asan_heap-oob_4d4eb0_3994_cov_3169972261_zmbv_15bit.avi Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 1f5c7781e63d6519192ada59c1e36bcecc92791d) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avcodec/snowdec: Fix ref value checkMichael Niedermayer2015-06-101-1/+1
| | | | | | | | | | | Fixes integer overflow and out of array read. Fixes: signal_sigsegv_24169e6_3445_cov_3778346427_snow_chroma_bug.avi Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 8f4cbf940212079a34753c7f4d6c6b5a43586d30) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* swscale/utils: More carefully merge and clear coefficients outside the inputMichael Niedermayer2015-06-101-5/+15
| | | | | | | | | | | Fixes out of array read Fixes: asan_heap-oob_35ca682_1474_cov_3230122439_aletrek_tga_16bit.mov Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 1895d414aaacece3b57d7bf19502305e9a064fae) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avcodec/a64multienc: fix use of uninitialized values in to_meta_with_cropAndreas Cadhalpun2015-06-101-3/+7
| | | | | | | | | | Averaging over 2 pixels doesn't work correctly for the last pixel, because the rest of the buffer is not initialized. Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 87513d654546a99f8ddb045ca4fa5d33778a617e) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avcodec/a64multienc: don't set incorrect packet sizeMichael Niedermayer2015-06-101-2/+3
| | | | | | | | | | | | | This fixes invalid reads of the packet buffer in av_dup_packet Based on patch by Andreas Cadhalpun <andreas.cadhalpun@googlemail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit d96142e9af92ded84f2580620c571ab96c4bb657) Conflicts: libavcodec/a64multienc.c
* avcodec/a64multienc: use av_frame_ref instead of copying the frameAndreas Cadhalpun2015-06-101-1/+3
| | | | | | | | | This fixes freeing the frame buffer twice on cleanup leading to a crash. Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 39e4ed7c1d8d840be47f6d604704d47a59a9ae5d) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avcodec/x86/mlpdsp_init: Simplify mlp_filter_channel_x86()Michael Niedermayer2015-06-101-4/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | Based on patch by Francisco Blas Izquierdo Riera Commit message partly taken from carl fixes a compilation error in mlpdsp_init.c with -fstack-check and some gcc compilers (I reproduced the issue with gcc 4.7.3) by simplifying the code. See also https://bugs.gentoo.org/show_bug.cgi?id=471756 $ make libavcodec/x86/mlpdsp_init.o libavcodec/x86/mlpdsp_init.c: In function ‘mlp_filter_channel_x86’: libavcodec/x86/mlpdsp_init.c:142:5: error: can’t find a register in class ‘GENERAL_REGS’ while reloading ‘asm’ libavcodec/x86/mlpdsp_init.c:142:5: error: ‘asm’ operand has impossible constraints 4551 -> 4509 dezicycles Reviewed-by: Ramiro Polla <ramiro.polla@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 03f39fbb2a558153a3c464edec1378d637a755fe) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* h264: initialize H264Context.avctx in init_thread_copyAnton Khirnov2015-06-101-0/+1
| | | | | | | | | | | | This prevents using a wrong (first thread's) AVCodecContext if decoding a frame in the first pass over all threads fails. (cherry picked from commit a06b0b1295c51d100101e0ca0434e199ad6de6b5) Conflicts: libavcodec/h264.c Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avformat/vqf: Use 64bit for ret to avoid overflowMichael Niedermayer2015-06-101-1/+1
| | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit cb08687180683a755d0fe9d425280d0e4d1e6db2) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avformat/mvdec: Use 64bit for ret to avoid overflowMichael Niedermayer2015-06-101-1/+1
| | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 26c0cc154e06cb0064b3a3da49447ac44d82444f) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>