summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* doc/utils: fix typo for min() descriptionrelease/2.0Paul B Mahol2016-03-021-1/+1
| | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com> (cherry picked from commit bdf474bcff29f5b40fe14f6fa1dbe10e69c73ab7) Signed-off-by: Timothy Gu <timothygu99@gmail.com>
* swscale/x86/rgb2rgb_template: Do not crash on misaligend strideMichael Niedermayer2015-12-151-1/+4
| | | | | | | Fixes Ticket5013 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit 80bfce35ccd11458e97f68f417fc094c5347070c)
* avcodec/ffv1dec: Clear quant_table_count if its invalidMichael Niedermayer2015-12-061-0/+1
| | | | | | | | | | | | Fixes deallocation of corrupted pointer Fixes: 343dfbe142a38b521ed069dc4ea7c03b/signal_sigsegv_421427_4074_ffb11959610278cd40dbc153464aa254.avi No releases affected Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit e04126072e984f8db5db9da9303c89ae01f7d6bb) Fixes ticket #5052.
* avcodec/ffv1dec: Print an error if the quant table count is invalidMichael Niedermayer2015-12-061-1/+3
| | | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit a8b254e436dce2f5c8c6459108dab4b02cc6b79b)
* avcodec/ffv1dec: Check for 0 quant tablesMichael Niedermayer2015-12-061-1/+1
| | | | | | | | | Fixes assertion failure Fixes: 07ec1fc3c1cbf2d3edcd7d9b52ca156c/asan_heap-oob_13624c5_491_ecd4720a03e697ba750b235690656c8f.avi Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit 5745cf799a4389bc5d14f2b4daf32fe4631c50bc)
* doc/filters/drawtext: fix centering exampleAndrey Utkin2015-12-011-1/+1
| | | | | | | Signed-off-by: Andrey Utkin <andrey.od.utkin@gmail.com> Signed-off-by: Lou Logan <lou@lrcd.com> (cherry picked from commit 648b26acc5e25ab40c43fddc54b50e9f0b13ebd8) Signed-off-by: Timothy Gu <timothygu99@gmail.com>
* avcodec/h264_mp4toannexb_bsf: Reorder operations in nal_size checkMichael Niedermayer2015-10-101-1/+1
| | | | | | | Fixes Ticket4778 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit 2bb54b82b5094fd906aa28c0443be08c95662a31)
* avformat/oggenc: Check segments_count for headers tooMichael Niedermayer2015-10-101-4/+7
| | | | | | | | Fixes infinite loop and segfault in ogg_buffer_data() Fixes Ticket4806 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit 81a8701eb52d2b6469ae16ef442ce425388141b7)
* avformat/avidec: Workaround broken initial frameMichael Niedermayer2015-10-101-1/+2
| | | | | | | | | | Fixes Ticket4851 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit 3e2ef00394b8079e93835d47c993868229f07502) Conflicts: libavformat/avidec.c
* avcodec/ffv1: seperate slice_count from max_slice_countMichael Niedermayer2015-10-104-11/+15
| | | | | | | | | | | | Fix segfault with too large slice_count Fixes Ticket4879 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit aa6c43f3fdec8a7518534b9dab20c9eb4be11568) Conflicts: libavcodec/ffv1enc.c libavcodec/ffv1.c
* avcodec/mp3: fix skipping zeroswm42015-10-101-1/+3
| | | | | | | | | | | | | | | | | | Commits 43bc5cf9 and c5371f77 add code for skipping initial zeros in mp3 packets. This code forgot to report to the user that data was skipped at all. Since audio codecs allow partial packet decoding, the user application has to rely on the return value. It will remove the data reported as consumed by the decoder, and feed it to the decoder again. This resulted in the mp3 frame after the zero region to be decoded over and over again, until the zero region was finally skipped by the application. Fix this by including the amount of skipped bytes to the number of consumed bytes returned by the decode call. Fixes trac ticket #4890. (cherry picked from commit cb1da9fb8d71bb611a7b0028914c97afc3f5711d)
* MAINTAINERS: Remove myself as leaderMichael Niedermayer2015-07-311-1/+0
| | | | | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit f2c58931e629343f7d68258cc2b2d62c5f501ba5) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* 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 <michaelni@gmx.at> (cherry picked from commit 6a1204a1a46674084b1e6b92562f81aaab7aac69)
* avfilter/x86/vf_hqdn3d: Fix register typesMichael Niedermayer2015-06-191-2/+2
| | | | | | | Fixes Ticket4301 Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 52fc3e372f8ed4de5735abed1f7f7569fe37b023)
* Update for 2.0.7n2.0.7Michael Niedermayer2015-06-103-3/+3
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avdevice/lavfi: do not rescale AV_NOPTS_VALUE in lavfi_read_packet()Michael Niedermayer2015-06-101-1/+1
| | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 913685f55208efd78bfc34d82b261bd449e69774) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avcodec/x86/h264_weight: handle weight1=128Michael Niedermayer2015-06-101-0/+3
| | | | | | | | | Fix ticket4596 Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit e1009665759d4a3938dd2dd07b7e84d8bc9c5290) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avcodec/jpeg2000dec: Check that coords match before applying ICTMichael Niedermayer2015-06-101-1/+6
| | | | | | | | | This avoid potential out of array accesses Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 12ba1b2b4d5592c0e27b0fcc83db929e8d6a8eee) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avformat/ffmdec: Check ffio_set_buf_size() return valueMichael Niedermayer2015-06-101-1/+3
| | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit dc55477a64cefebf8dcc611f026be71382814ae2) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avcodec/adpcm: Check for overreadsMichael Niedermayer2015-06-101-1/+12
| | | | | | | | | See: vlc ticket 14649 Reported-by: carl Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 3c803ed9cb23e5a8d76b6c31d8a8c71cac27e769) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avcodec/alsdec: Check for overreadMichael Niedermayer2015-06-101-0/+5
| | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit c2657633187e325a439e3297fd9ccd0522ab2e39) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avformat/mxfenc: Accept MXF D-10 with 49.999840 Mbit/secMichael Niedermayer2015-06-101-3/+4
| | | | | | | | | | This is the maximum rate possible based on the frame size limit of MXF D-10 Previous version reviewed by tim nicholson <nichot20@yahoo.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit d7a762553c6f6c422adb6632354bcc4ff577b701) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* swresample/dither: check memory allocationGanesh Ajjanagadde2015-06-103-3/+8
| | | | | | | | | check memory allocation in swri_get_dither() Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 196b885a5f0aa3ca022c1fa99509f47341239784) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* swresample: Check the return value of resampler->init()Michael Niedermayer2015-06-101-0/+4
| | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 02915602d9313aa4b108342a3081244b9d2422bf) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* h264: Make sure reinit failures mark the context as not initializedLuca Barbato2015-06-101-1/+1
| | | | | | | | | | | | | | | (cherry picked from commit 3b69f245dbe6e2016659a45c4bfe284f6c5ac57e) Signed-off-by: Reinhard Tartler <siretart@tauware.de> Conflicts: libavcodec/h264_slice.c (cherry picked from commit 964fef3f3ced60e67831549df223bc177e1537c9) Signed-off-by: Michael Niedermayer <michaelni@gmx.at> Conflicts: libavcodec/h264.c
* avcodec/h264_slice: More complete cleanup in h264_slice_header_init()Michael Niedermayer2015-06-101-3/+12
| | | | | | | | | | | | Fixes null pointer dereference Fixes Ticket3873 Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 1fa35e4352cc39894987e14de464e3d72b55739f) Conflicts: libavcodec/h264_slice.c
* nutdec: stop skipping bytes at EOFAndreas Cadhalpun2015-06-101-3/+18
| | | | | | | | | | This can unnecessarily waste a lot of time. Reviewed-by: Michael Niedermayer <michaelni@gmx.at> Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com> (cherry picked from commit fa7dec8cb00d2d0dd96ff9863ccda38428610a21) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* nutdec: fix infinite resync loopsAndreas Cadhalpun2015-06-102-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 <michaelni@gmx.at> Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com> (cherry picked from commit 37e679881d364b6da817d829d35869d657218ab3) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avformat/nutdec: Check X in 2nd branch of index readingMichael Niedermayer2015-06-101-0/+4
| | | | | | | | | | Prevents read of uninitialized variable Based on patch by: Andreas Cadhalpun <andreas.cadhalpun@googlemail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit ebb0ca3d70465ab6d369a66b2ef43bb059705db8) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avformat/nutdec: Fix recovery when immedeately after seeking a failure happensMichael Niedermayer2015-06-101-0/+1
| | | | | | | | Found-by: Andreas Cadhalpun <andreas.cadhalpun@googlemail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit b3496b4a33e806b7afdcbbf6f468b0332b676d7c) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avformat/nutdec: Return error on EOF from get_str()Michael Niedermayer2015-06-101-0/+2
| | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 6bbb2f8f4da67af374d62403742482cc5962aa21) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* rtsp: Make sure we don't write too many transport entries into a fixed-size ↵Martin Storsjö2015-06-101-0/+2
| | | | | | | | array (cherry picked from commit b90adb0aba073f9c1b4abca852119947393ced4c) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* rtpenc_jpeg: handle case of picture dimensions not dividing by 8Andrey Utkin2015-06-101-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 <silvo@gmx.net> Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 7f64a7503b19b39f1251e4380987034c569bebf5) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avcodec/libtheoraenc: Check for av_malloc failureMichael Niedermayer2015-06-101-0/+2
| | | | | | | | | Fixes CID1257799 Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit c64b2d480b4a35d4face9928b4265a0fda3f3dd9) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avcodec/dcadec: Check active_bandsMichael Niedermayer2015-06-101-1/+6
| | | | | | | | | Fixes CID1297594 part2 Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit fc624ec9ba7e5c4e8d905ac10f605a43d123f95a) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avcodec/dcadec: Check scale table indexMichael Niedermayer2015-06-101-4/+15
| | | | | | | | | | | Fixes CID1297594 part 1 Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 0f3e6959bfa67d12cd5a173b86eb15abd7d9e4d5) Conflicts: libavcodec/dcadec.c
* avcodec/sonic: More completely check sample_rate_index and channelsMichael Niedermayer2015-06-101-2/+8
| | | | | | | | | Fixes CID1271783 Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit ade8a46154cb45c88b1cb5c616eaa6320c941187) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avcodec/smvjpegdec: check avcodec_decode_video2() return codeMichael Niedermayer2015-06-101-0/+4
| | | | | | | | | Fixes CID1271810 Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit cdd25f9a3df3905543a5546cf6076d2eaf895736) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avcodec/shorten: More complete pred_order checkMichael Niedermayer2015-06-101-1/+1
| | | | | | | | | Fixes CID1239055 Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 294469416d8193a28710d802bb0c46e5fa09fad7) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avcodec/shorten: Check skip_bytes()Michael Niedermayer2015-06-101-0/+5
| | | | | | | | | Fixes CID1210526 Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit d201becfc0d89c6a5dfe44e96f1044fbc2aadb70) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avcodec/shorten: Fix code depending on signed overflow behaviorMichael Niedermayer2015-06-101-2/+1
| | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 2d15588124ab1d4c0612cab66f02a716f1509211) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avcodec/proresdec2: Reset slice_count on deallocationMichael Niedermayer2015-06-101-0/+1
| | | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit c4c6aea397f62421bf8ef0449b2b465a53e4ab4d) Conflicts: libavcodec/proresdec2.c
* ffmpeg_opt: Fix -timestamp parsingMichael Niedermayer2015-06-101-1/+1
| | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 107e4da47644fe615ea821d6a19682d73789aca7) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avcodec/dcadec: Check subsubframesMichael Niedermayer2015-06-101-0/+4
| | | | | | | | | Fixes: CID1239152 Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit a9bf628bfdad142763880a3d1ccb6058040dda57) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avcodec/dcadec: Check nchansMichael Niedermayer2015-06-101-0/+8
| | | | | | | | | Fixes CID1239110 Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit a6a45774d045007f8262cd7c614804390e53122e) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avcodec/cavsdec: Check esc_codeMichael Niedermayer2015-06-101-0/+5
| | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 139e1c8009df7729a53eaaae7036ca01071aced5) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avcodec/mpeg4audio: add some padding/alignment to MAX_PCE_SIZEMichael Niedermayer2015-06-101-1/+1
| | | | | | | | | This avoids potential accesses over the end Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 93cfa7d1692c25cff045f99ba1af2c9e5772c45e) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avcodec/mjpegdec: fix len computation in ff_mjpeg_decode_dqt()Michael Niedermayer2015-06-101-1/+1
| | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 81cf9108563510dee24f73b2c5d94a7bd07ff747) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avcodec/jpeg2000dec: fix boolean operatorMichael Niedermayer2015-06-101-1/+1
| | | | | | | | | Fixes CID1271791 #7-6 Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit f8f155a18ac454e7ff3312e0e0c3a70eb4359143) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avcodec/vqavideo: Check chunk sizeMichael Niedermayer2015-06-101-0/+6
| | | | | | | | | Fixes CID1239154 Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 8a62b80ce6c8e87e7937f9a5d68f83882c1c8da2) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
View Lorry Controller Status