github-mirrors/FFmpeg
1
0
Fork 0
mirror of https://mirror.skon.top/https://github.com/FFmpeg/FFmpeg synced 2026-04-21 13:21:55 +08:00
Code Issues Packages Projects Releases Wiki Activity
55,098 Commits 39 Branches 417 Tags
release/2.0
Commit Graph

55098 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Paul B Mahol
72006016ae doc/utils: fix typo for min() description 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
(cherry picked from commit bdf474bcff)
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
 2016-03-02 16:47:08 -08:00
Michael Niedermayer
f23efdd240 swscale/x86/rgb2rgb_template: Do not crash on misaligend stride 
Fixes Ticket5013

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 80bfce35cc)
 2015-12-15 11:22:18 +01:00
Michael Niedermayer
2789b48b4e avcodec/ffv1dec: Clear quant_table_count if its invalid 
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 e04126072e)

Fixes ticket #5052.
 2015-12-06 14:15:31 +01:00
Michael Niedermayer
5628d62022 avcodec/ffv1dec: Print an error if the quant table count is invalid 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit a8b254e436)
 2015-12-06 14:15:29 +01:00
Michael Niedermayer
58986f0fa1 avcodec/ffv1dec: Check for 0 quant tables 
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 5745cf799a)
 2015-12-06 14:15:27 +01:00
Andrey Utkin
c513e721f3 doc/filters/drawtext: fix centering example 
Signed-off-by: Andrey Utkin <andrey.od.utkin@gmail.com>
Signed-off-by: Lou Logan <lou@lrcd.com>
(cherry picked from commit 648b26acc5)
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
 2015-12-01 17:34:09 -08:00
Michael Niedermayer
087561a7dc avcodec/h264_mp4toannexb_bsf: Reorder operations in nal_size check 
Fixes Ticket4778

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 2bb54b82b5)
 2015-10-10 01:15:12 +02:00
Michael Niedermayer
0b0183c5b7 avformat/oggenc: Check segments_count for headers too 
Fixes infinite loop and segfault in ogg_buffer_data()
Fixes Ticket4806

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 81a8701eb5)
 2015-10-10 01:14:58 +02:00
Michael Niedermayer
055c302a11 avformat/avidec: Workaround broken initial frame 
Fixes Ticket4851

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 3e2ef00394)

Conflicts:
	libavformat/avidec.c
 2015-10-10 01:14:12 +02:00
Michael Niedermayer
b44025a1d0 avcodec/ffv1: seperate slice_count from max_slice_count 
Fix segfault with too large slice_count
Fixes Ticket4879

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit aa6c43f3fd)

Conflicts:
	libavcodec/ffv1enc.c
	libavcodec/ffv1.c
 2015-10-10 01:12:18 +02:00
wm4
7fc8458beb avcodec/mp3: fix skipping zeros 
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 cb1da9fb8d)
 2015-10-10 01:12:08 +02:00
Michael Niedermayer
9b493887d5 MAINTAINERS: Remove myself as leader 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit f2c58931e6)

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-31 18:35:33 +02:00
Michael Niedermayer
804b90a5f5 avformat/swfdec: Do not error out on pixel format changes 
Instead print an error and continue

Fixes Ticket4702

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 6a1204a1a4)
 2015-07-08 12:54:26 +02:00
Michael Niedermayer
4a2be7027f avfilter/x86/vf_hqdn3d: Fix register types 
Fixes Ticket4301

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 52fc3e372f)
 2015-06-19 11:51:31 +02:00
Michael Niedermayer
0caff57c42 Update for 2.0.7 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
n2.0.7 		2015-06-10 03:26:56 +02:00
Michael Niedermayer
af79d964a7 avdevice/lavfi: do not rescale AV_NOPTS_VALUE in lavfi_read_packet() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 913685f552)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-10 02:13:12 +02:00
Michael Niedermayer
8320aa7dc7 avcodec/x86/h264_weight: handle weight1=128 
Fix ticket4596

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit e100966575)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-10 02:13:12 +02:00
Michael Niedermayer
7a9f4f2816 avcodec/jpeg2000dec: Check that coords match before applying ICT 
This avoid potential out of array accesses

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 12ba1b2b4d)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-10 02:13:12 +02:00
Michael Niedermayer
1fe67c9472 avformat/ffmdec: Check ffio_set_buf_size() return value 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit dc55477a64)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-10 02:13:12 +02:00
Michael Niedermayer
6fd4b2b84f avcodec/adpcm: Check for overreads 
See: vlc ticket 14649
Reported-by: carl
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 3c803ed9cb)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-10 02:13:12 +02:00
Michael Niedermayer
a3740b6a86 avcodec/alsdec: Check for overread 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit c265763318)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-10 02:13:12 +02:00
Michael Niedermayer
ff0e9060a5 avformat/mxfenc: Accept MXF D-10 with 49.999840 Mbit/sec 
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 d7a762553c)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-10 02:13:12 +02:00
Ganesh Ajjanagadde
6d7384bd73 swresample/dither: check memory allocation 
check memory allocation in swri_get_dither()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 196b885a5f)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-10 02:13:12 +02:00
Michael Niedermayer
9db97584ca swresample: Check the return value of resampler->init() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 02915602d9)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-10 02:13:12 +02:00
Luca Barbato
04bb8cc842 h264: Make sure reinit failures mark the context as not initialized 
(cherry picked from commit 3b69f245db)
Signed-off-by: Reinhard Tartler <siretart@tauware.de>

Conflicts:
	libavcodec/h264_slice.c
(cherry picked from commit 964fef3f3c)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Conflicts:

	libavcodec/h264.c
 2015-06-10 02:13:12 +02:00
Michael Niedermayer
03c80a7400 avcodec/h264_slice: More complete cleanup in h264_slice_header_init() 
Fixes null pointer dereference
Fixes Ticket3873

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 1fa35e4352)

Conflicts:

	libavcodec/h264_slice.c
 2015-06-10 02:13:12 +02:00
Andreas Cadhalpun
b6ae28c2e9 nutdec: stop skipping bytes at EOF 
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 fa7dec8cb0)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-10 02:13:12 +02:00
Andreas Cadhalpun
5123c8aa0b nutdec: fix infinite resync loops 
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 37e679881d)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-10 02:13:12 +02:00
Michael Niedermayer
6cb8599bab avformat/nutdec: Check X in 2nd branch of index reading 
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 ebb0ca3d70)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-10 02:13:12 +02:00
Michael Niedermayer
00b8a9dd8d avformat/nutdec: Fix recovery when immedeately after seeking a failure happens 
Found-by: Andreas Cadhalpun <andreas.cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit b3496b4a33)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-10 02:13:12 +02:00
Michael Niedermayer
9dd9090b89 avformat/nutdec: Return error on EOF from get_str() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 6bbb2f8f4d)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-10 02:13:12 +02:00
Martin Storsjö
fd1be2bd87 rtsp: Make sure we don't write too many transport entries into a fixed-size array 
(cherry picked from commit b90adb0aba)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-10 02:13:12 +02:00
Andrey Utkin
ced57c6ef3 rtpenc_jpeg: handle case of picture dimensions not dividing by 8 
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 7f64a7503b)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-10 02:13:12 +02:00
Michael Niedermayer
13b22617c1 avcodec/libtheoraenc: Check for av_malloc failure 
Fixes CID1257799

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit c64b2d480b)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-10 02:13:12 +02:00
Michael Niedermayer
c01f551728 avcodec/dcadec: Check active_bands 
Fixes CID1297594 part2

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit fc624ec9ba)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-10 02:13:12 +02:00
Michael Niedermayer
a3d05bf6be avcodec/dcadec: Check scale table index 
Fixes CID1297594 part 1

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 0f3e6959bf)

Conflicts:

	libavcodec/dcadec.c
 2015-06-10 02:13:11 +02:00
Michael Niedermayer
025b38f3a6 avcodec/sonic: More completely check sample_rate_index and channels 
Fixes CID1271783

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit ade8a46154)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-10 02:13:11 +02:00
Michael Niedermayer
41c81556a7 avcodec/smvjpegdec: check avcodec_decode_video2() return code 
Fixes CID1271810

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit cdd25f9a3d)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-10 02:13:11 +02:00
Michael Niedermayer
f58c9746c3 avcodec/shorten: More complete pred_order check 
Fixes CID1239055

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 294469416d)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-10 02:13:11 +02:00
Michael Niedermayer
a7c8dc67e7 avcodec/shorten: Check skip_bytes() 
Fixes CID1210526

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit d201becfc0)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-10 02:13:11 +02:00
Michael Niedermayer
0888e7110e avcodec/shorten: Fix code depending on signed overflow behavior 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 2d15588124)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-10 02:13:11 +02:00
Michael Niedermayer
990c2ee3bd avcodec/proresdec2: Reset slice_count on deallocation 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit c4c6aea397)

Conflicts:

	libavcodec/proresdec2.c
 2015-06-10 02:13:11 +02:00
Michael Niedermayer
ffd894917f ffmpeg_opt: Fix -timestamp parsing 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 107e4da476)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-10 02:13:11 +02:00
Michael Niedermayer
3fedff3985 avcodec/dcadec: Check subsubframes 
Fixes: CID1239152

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit a9bf628bfd)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-10 02:13:11 +02:00
Michael Niedermayer
c532c56e7b avcodec/dcadec: Check nchans 
Fixes CID1239110

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit a6a45774d0)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-10 02:13:11 +02:00
Michael Niedermayer
36bc9519b6 avcodec/cavsdec: Check esc_code 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 139e1c8009)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-10 02:13:11 +02:00
Michael Niedermayer
136bd71f69 avcodec/mpeg4audio: add some padding/alignment to MAX_PCE_SIZE 
This avoids potential accesses over the end

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 93cfa7d169)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-10 02:13:11 +02:00
Michael Niedermayer
c0726da933 avcodec/mjpegdec: fix len computation in ff_mjpeg_decode_dqt() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 81cf910856)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-10 02:13:11 +02:00
Michael Niedermayer
32f568f82c avcodec/jpeg2000dec: fix boolean operator 
Fixes CID1271791 #7-6

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit f8f155a18a)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-10 02:13:11 +02:00
Michael Niedermayer
0bf455c054 avcodec/vqavideo: Check chunk size 
Fixes CID1239154

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 8a62b80ce6)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-10 02:13:11 +02:00