summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* avdevice/lavfi: do not rescale AV_NOPTS_VALUE in lavfi_read_packet()Michael Niedermayer2015-07-201-1/+1
| | | | | | | Signed-off-by: Michael Niedermayer <[email protected]> (cherry picked from commit 913685f55208efd78bfc34d82b261bd449e69774) Signed-off-by: Michael Niedermayer <[email protected]>
* libavutil/channel_layout: Correctly return layout when channel specification ↵Simon Thelen2015-07-201-1/+1
| | | | | | | | | | | | | ends with a trailing 'c'. Return layout when FF_API_GET_CHANNEL_LAYOUT_COMPAT is set even if the layout itself is not in the deprecated style. Signed-off-by: Simon Thelen <[email protected]> Signed-off-by: Michael Niedermayer <[email protected]> (cherry picked from commit 83307a32eb0c9f0843f655c44bb65e3e999153f8) Signed-off-by: Michael Niedermayer <[email protected]>
* avcodec/jpeg2000dec: Check that coords match before applying ICTMichael Niedermayer2015-07-201-1/+6
| | | | | | | | | This avoid potential out of array accesses Signed-off-by: Michael Niedermayer <[email protected]> (cherry picked from commit 12ba1b2b4d5592c0e27b0fcc83db929e8d6a8eee) Signed-off-by: Michael Niedermayer <[email protected]>
* avformat/ffmdec: Check ffio_set_buf_size() return valueMichael Niedermayer2015-07-201-1/+3
| | | | | | | Signed-off-by: Michael Niedermayer <[email protected]> (cherry picked from commit dc55477a64cefebf8dcc611f026be71382814ae2) Signed-off-by: Michael Niedermayer <[email protected]>
* avcodec/adpcm: Check for overreadsMichael Niedermayer2015-07-201-1/+12
| | | | | | | | | See: vlc ticket 14649 Reported-by: carl Signed-off-by: Michael Niedermayer <[email protected]> (cherry picked from commit 3c803ed9cb23e5a8d76b6c31d8a8c71cac27e769) Signed-off-by: Michael Niedermayer <[email protected]>
* avcodec/alsdec: Check for overreadMichael Niedermayer2015-07-201-0/+5
| | | | | | | Signed-off-by: Michael Niedermayer <[email protected]> (cherry picked from commit c2657633187e325a439e3297fd9ccd0522ab2e39) Signed-off-by: Michael Niedermayer <[email protected]>
* avcodec/atrac3plusdec: consume only as many bytes as availableMichael Niedermayer2015-07-201-1/+1
| | | | | | | Signed-off-by: Michael Niedermayer <[email protected]> (cherry picked from commit 6b6ae7c3ead5dee786a4aea929820076a7c82da4) Signed-off-by: Michael Niedermayer <[email protected]>
* libavutil/softfloat: Fix av_normalize1_sf bias.Nedeljko Babic2015-07-201-1/+1
| | | | | | | | | | av_normalize1_sf doesn't properly address border case when mantis is exactly -0x40000000. Signed-off-by: Michael Niedermayer <[email protected]> (cherry picked from commit 7131aba916d1f562bdaf6a81319f1421ce175b1e) Signed-off-by: Michael Niedermayer <[email protected]>
* swresample/swresample: Cleanup on init failure.Michael Niedermayer2015-07-201-10/+24
| | | | | | | | | | | This avoids leaks if the user doest call swr_close() after a failed init Found-by: James Almer <[email protected]> Reviewed-by: James Almer <[email protected]> Signed-off-by: Michael Niedermayer <[email protected]> (cherry picked from commit c3f87f7545d42520921bc448b9fbd7324c574e49) Signed-off-by: Michael Niedermayer <[email protected]>
* Revert "avformat/rtpenc: check av_packet_get_side_data() return, fix null ↵Michael Niedermayer2015-07-201-4/+0
| | | | | | | | | | | | ptr dereference" This was simply wrong Found-by: Martin Storsjö This reverts commit 5d8e4f6da03c0342157e6ac7fab1a8ac3a87a8b0. (cherry picked from commit 3e34b7498f14c04baadde1700a6f73a7e9e86fa6) Signed-off-by: Michael Niedermayer <[email protected]>
* avformat/mxfenc: Accept MXF D-10 with 49.999840 Mbit/secMichael Niedermayer2015-07-201-3/+4
| | | | | | | | | | This is the maximum rate possible based on the frame size limit of MXF D-10 Previous version reviewed by tim nicholson <[email protected]> Signed-off-by: Michael Niedermayer <[email protected]> (cherry picked from commit d7a762553c6f6c422adb6632354bcc4ff577b701) Signed-off-by: Michael Niedermayer <[email protected]>
* swresample/dither: check memory allocationGanesh Ajjanagadde2015-07-203-3/+8
| | | | | | | | | check memory allocation in swri_get_dither() Signed-off-by: Michael Niedermayer <[email protected]> (cherry picked from commit 196b885a5f0aa3ca022c1fa99509f47341239784) Signed-off-by: Michael Niedermayer <[email protected]>
* libopenjpegenc: add NULL check for img before accessing itAndreas Cadhalpun2015-07-201-0/+3
| | | | | | | | | | | If opj_image_create fails to allocate an image it returns NULL, which causes a segmentation fault at 'img->x0 = 0'. Reviewed-by: Michael Niedermayer <[email protected]> Signed-off-by: Andreas Cadhalpun <[email protected]> (cherry picked from commit 1577526b47439f33a999339efdec5d624b70e1da) Signed-off-by: Michael Niedermayer <[email protected]>
* swresample: Check the return value of resampler->init()Michael Niedermayer2015-07-201-0/+4
| | | | | | | Signed-off-by: Michael Niedermayer <[email protected]> (cherry picked from commit 02915602d9313aa4b108342a3081244b9d2422bf) Signed-off-by: Michael Niedermayer <[email protected]>
* h264: Make sure reinit failures mark the context as not initializedLuca Barbato2015-07-201-0/+1
| | | | | (cherry picked from commit 0181ae9af2de1526464d23209b82e6674d362f5d) Signed-off-by: Michael Niedermayer <[email protected]>
* avfilter/x86/vf_fspp: Fix invalid combination of opcode and operandsMichael Niedermayer2015-07-201-4/+4
| | | | | | | Signed-off-by: Michael Niedermayer <[email protected]> (cherry picked from commit 5bc2c395273e020fc255a644196f0fc7c8e5ed83) Signed-off-by: Michael Niedermayer <[email protected]>
* ffmpeg_opt: Set the video VBV parameters only for the video stream from -targetMichael Niedermayer2015-07-201-9/+9
| | | | | | | Signed-off-by: Michael Niedermayer <[email protected]> (cherry picked from commit 2ce6e419113f8276f417a9a8b50122c5467d9bc5) Signed-off-by: Michael Niedermayer <[email protected]>
* avcodec/bitstream: Assert that there is enough space left in avpriv_copy_bits()Michael Niedermayer2015-07-201-0/+2
| | | | | | | Signed-off-by: Michael Niedermayer <[email protected]> (cherry picked from commit 291ad5cc9cf815eb110b062487980fab2d107936) Signed-off-by: Michael Niedermayer <[email protected]>
* avcodec/put_bits: Assert that there is enough space left in skip_put_bytes()Michael Niedermayer2015-07-201-0/+1
| | | | | | | Signed-off-by: Michael Niedermayer <[email protected]> (cherry picked from commit 8f5ffed183e099128a732a00976f69fdc641d093) Signed-off-by: Michael Niedermayer <[email protected]>
* avcodec/mpegvideo_enc: Update the buffer size as more slices are mergedMichael Niedermayer2015-07-201-0/+2
| | | | | | | Signed-off-by: Michael Niedermayer <[email protected]> (cherry picked from commit 561d3a57aaa95c7e8e65e96b36dd069100603650) Signed-off-by: Michael Niedermayer <[email protected]>
* avcodec/put_bits: Update size_in_bits in set_put_bits_buffer_size()Michael Niedermayer2015-07-201-0/+1
| | | | | | | Signed-off-by: Michael Niedermayer <[email protected]> (cherry picked from commit e4c2ec879b1121c02279cd60a54643da0d249e40) Signed-off-by: Michael Niedermayer <[email protected]>
* avformat/wavdec: Increase dts packet threshold to fix more misdetectionsRodger Combs2015-07-201-1/+1
| | | | | | | Signed-off-by: Michael Niedermayer <[email protected]> (cherry picked from commit 40a3e1e9c54997e4dfc7802b5a758b68ceb64982) Signed-off-by: Michael Niedermayer <[email protected]>
* avformat/wavdec: Increase probe_packets limitMichael Niedermayer2015-07-201-1/+1
| | | | | | | | | Fixes DTS detection of b2429e5ba9.dts Signed-off-by: Michael Niedermayer <[email protected]> (cherry picked from commit 9f5769437aaab30a359cde254f39d9a28b1ce657) Signed-off-by: Michael Niedermayer <[email protected]>
* nutdec: abort if EOF is reached in decode_info_header/read_sm_dataAndreas Cadhalpun2015-07-201-4/+12
| | | | | | | | | | These loops can take a lot of time if count is very large. Reviewed-by: Michael Niedermayer <[email protected]> Signed-off-by: Andreas Cadhalpun <[email protected]> (cherry picked from commit bb23a15df507440deb0dcf25099d321d0f73dc28) Signed-off-by: Michael Niedermayer <[email protected]>
* nutdec: stop skipping bytes at EOFAndreas Cadhalpun2015-07-201-3/+18
| | | | | | | | | | This can unnecessarily waste a lot of time. Reviewed-by: Michael Niedermayer <[email protected]> Signed-off-by: Andreas Cadhalpun <[email protected]> (cherry picked from commit fa7dec8cb00d2d0dd96ff9863ccda38428610a21) Signed-off-by: Michael Niedermayer <[email protected]>
* nutdec: fix infinite resync loopsAndreas Cadhalpun2015-07-202-1/+5
| | | | | | | | | | | | | | | | | | nut->last_syncpoint_pos doesn't necessarily change between resync attempts, so find_any_startcode can return the same startcode again. Thus remember where the last resync happened and don't try to resync before that. This can't be done locally in nut_read_packet, because this wouldn't prevent infinite resync loops, where after the resync a packet is returned and while reading a following packet the resync happens again. Reviewed-by: Michael Niedermayer <[email protected]> Signed-off-by: Andreas Cadhalpun <[email protected]> (cherry picked from commit 37e679881d364b6da817d829d35869d657218ab3) Signed-off-by: Michael Niedermayer <[email protected]>
* avformat/nutdec: Check X in 2nd branch of index readingMichael Niedermayer2015-07-201-0/+4
| | | | | | | | | | Prevents read of uninitialized variable Based on patch by: Andreas Cadhalpun <[email protected]> Signed-off-by: Michael Niedermayer <[email protected]> (cherry picked from commit ebb0ca3d70465ab6d369a66b2ef43bb059705db8) Signed-off-by: Michael Niedermayer <[email protected]>
* avformat/nutdec: Fix recovery when immedeately after seeking a failure happensMichael Niedermayer2015-07-201-0/+1
| | | | | | | | Found-by: Andreas Cadhalpun <[email protected]> Signed-off-by: Michael Niedermayer <[email protected]> (cherry picked from commit b3496b4a33e806b7afdcbbf6f468b0332b676d7c) Signed-off-by: Michael Niedermayer <[email protected]>
* avformat/nutdec: Return error on EOF from get_str()Michael Niedermayer2015-07-201-0/+2
| | | | | | | Signed-off-by: Michael Niedermayer <[email protected]> (cherry picked from commit 6bbb2f8f4da67af374d62403742482cc5962aa21) Signed-off-by: Michael Niedermayer <[email protected]>
* rtsp: Make sure we don't write too many transport entries into a fixed-size ↵Martin Storsjö2015-07-201-0/+2
| | | | | | | | array (cherry picked from commit b90adb0aba073f9c1b4abca852119947393ced4c) Signed-off-by: Michael Niedermayer <[email protected]>
* rtpenc_jpeg: handle case of picture dimensions not dividing by 8Andrey Utkin2015-07-201-2/+2
| | | | | | | | | | | This fixes the calculation of the number of needed blocks to make sure that ALL pixels are represented by the result. Reviewed-by: Thomas Volkert <[email protected]> Signed-off-by: Michael Niedermayer <[email protected]> (cherry picked from commit 7f64a7503b19b39f1251e4380987034c569bebf5) Signed-off-by: Michael Niedermayer <[email protected]>
* avcodec/golomb: get_ur_golomb_jpegls: Fix reading huge k valuesMichael Niedermayer2015-07-201-2/+10
| | | | | | | Signed-off-by: Michael Niedermayer <[email protected]> (cherry picked from commit c720b9ce9850710e74a103d9626869e397a89faa) Signed-off-by: Michael Niedermayer <[email protected]>
* avformat/swfdec: Do not error out on pixel format changesMichael Niedermayer2015-07-081-4/+2
| | | | | | | | | Instead print an error and continue Fixes Ticket4702 Signed-off-by: Michael Niedermayer <[email protected]> (cherry picked from commit 6a1204a1a46674084b1e6b92562f81aaab7aac69)
* avformat/mov: Mark avio context of decompressed atoms as seekableMichael Niedermayer2015-06-191-0/+1
| | | | | | | Fixes Ticket4329 Signed-off-by: Michael Niedermayer <[email protected]> (cherry picked from commit 8ce564ea280b61d21eebf8a2fd741f792ce81638)
* avcodec/mjpegenc_common: Use ff_mpv_reallocate_putbitbuffer()Michael Niedermayer2015-06-192-2/+12
| | | | | | | | Fixes assertion failure Fixes Ticket4396 Signed-off-by: Michael Niedermayer <[email protected]> (cherry picked from commit c50904fd7899e37516324e711b3b8edfe7214da8)
* avcodec/mpegvideo: Factor ff_mpv_reallocate_putbitbuffer() outMichael Niedermayer2015-06-192-23/+33
| | | | | Signed-off-by: Michael Niedermayer <[email protected]> (cherry picked from commit 00f3bb2ef2bb25fc41b7a905376f00d104f70185)
* avfilter/x86/vf_hqdn3d: Fix register typesMichael Niedermayer2015-06-191-2/+2
| | | | | | | Fixes Ticket4301 Signed-off-by: Michael Niedermayer <[email protected]> (cherry picked from commit 52fc3e372f8ed4de5735abed1f7f7569fe37b023)
* avcodec/exr: fix crash caused by mergePaul B Mahol2015-06-191-15/+16
| | | | | | | | | Various header informations need to be reset when decoding next frame. Regression since: 95582b5c Fixes ticket #4597. Signed-off-by: Paul B Mahol <[email protected]> (cherry picked from commit a03b69478b7f1c0c31e53acb0cf392917c0f967a)
* avcodec/x86/h264_weight: handle weight1=128Michael Niedermayer2015-06-191-0/+3
| | | | | | | Fix ticket4596 Signed-off-by: Michael Niedermayer <[email protected]> (cherry picked from commit e1009665759d4a3938dd2dd07b7e84d8bc9c5290)
* avcodec/dvbsubdec: Fix buf_size check in ↵banastasov2015-06-191-3/+3
| | | | | | | | | dvbsub_parse_display_definition_segment() Fixes Ticket4326 Signed-off-by: Michael Niedermayer <[email protected]> (cherry picked from commit debf4d6e67dfb29f3d71683add429c588828f8e8)
* avcodec/hevc_ps: Only discard overread VPS if a previous is availableMichael Niedermayer2015-06-191-1/+2
| | | | | | | Fixes Ticket4621 Signed-off-by: Michael Niedermayer <[email protected]> (cherry picked from commit 57078e4d255a06246fef27846073f5ffb312b5dc)
* avcodec/flacenc: Fix Invalid Rice orderGeorge Boyle2015-06-191-1/+1
| | | | | | | | | | | | | | | | | Fixes ticket #4628. The problem arose, in the sample file at least, in the last block where the minimum and maximum Rice partition orders were both 0. In that case, and any other where pmax == pmin, the original UINT32_MAX placeholder value for bits[opt_porder] was getting overwritten before the comparison to check if the current partition order is a new optimal, so the correct partition order and RiceContext params were not being set. Signed-off-by: Michael Niedermayer <[email protected]> (cherry picked from commit 2469ed32c81ebf2347e6883091c566724b286167) Conflicts: libavcodec/flacenc.c
* lavd/xcbgrab: fix comparison with screen size.Nicolas George2015-05-191-2/+2
| | | | | | Signed-off-by: Nicolas George <[email protected]> Signed-off-by: Michael Niedermayer <[email protected]> (cherry picked from commit 7971fa9ce0ead8d2e8a79dbe422e91dcef8222ba)
* avformat/avidec: add mp2 to the list of exceptions instead of generally ↵n2.6.3Michael Niedermayer2015-05-171-2/+3
| | | | | | | | | | | treating dshow_block_align==1 special Fixes Ticket4552 Signed-off-by: Michael Niedermayer <[email protected]> (cherry picked from commit 488383afd1275f6da53e9c83bc209c2f70d768ef) Signed-off-by: Michael Niedermayer <[email protected]>
* avformat/mov: Fix parsing short lociMichael Niedermayer2015-05-161-1/+1
| | | | | | | | | Fixes Ticket4557 Signed-off-by: Michael Niedermayer <[email protected]> (cherry picked from commit 50393bce31a5618f5125aaaf97bb69886fc4261d) Signed-off-by: Michael Niedermayer <[email protected]>
* avformat/mov: Print reason of loci parsing failureMichael Niedermayer2015-05-161-3/+9
| | | | | | | Signed-off-by: Michael Niedermayer <[email protected]> (cherry picked from commit 9e4f0cfc8ff4ab635ea12bdbd8d85d8bb1ba25f9) Signed-off-by: Michael Niedermayer <[email protected]>
* Update for 2.6.3Michael Niedermayer2015-05-163-2/+73
| | | | Signed-off-by: Michael Niedermayer <[email protected]>
* avcodec/hevc: Fix typo in num_entry_point_offsets checkMichael Niedermayer2015-05-151-1/+1
| | | | | | | Signed-off-by: Michael Niedermayer <[email protected]> (cherry picked from commit 3051e7fa712dfe2136f19b7157211453895f2a3c) Signed-off-by: Michael Niedermayer <[email protected]>
* avcodec/libtheoraenc: Check for av_malloc failureMichael Niedermayer2015-05-151-0/+2
| | | | | | | | | Fixes CID1257799 Signed-off-by: Michael Niedermayer <[email protected]> (cherry picked from commit c64b2d480b4a35d4face9928b4265a0fda3f3dd9) Signed-off-by: Michael Niedermayer <[email protected]>
* avcodec/dcadec: Check active_bandsMichael Niedermayer2015-05-151-1/+6
| | | | | | | | | Fixes CID1297594 part2 Signed-off-by: Michael Niedermayer <[email protected]> (cherry picked from commit fc624ec9ba7e5c4e8d905ac10f605a43d123f95a) Signed-off-by: Michael Niedermayer <[email protected]>
generated by cgit v1.2.3 (git 2.25.1) at 2025-09-23 12:47:24 +0000