[FFmpeg-cvslog] New commits on branch release/2.1
Git System
git at videolan.org
Thu Apr 30 02:01:59 CEST 2015
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e7cb5d41d1d66cf328253a14ccb209d4e34687d4
Author: Andreas Cadhalpun <Andreas.Cadhalpun at googlemail.com>
Date: Tue Apr 28 22:37:19 2015 +0200
nutdec: fix illegal count check in decode_main_header
The existing check has two problems:
1) i + count can overflow, so that the check '< 256' returns true.
2) In the (i == 'N') case occurs a j-- so that the loop runs once more.
This can trigger the assertion 'nut->header_len[0] == 0' or cause
segmentation faults or infinite hangs.
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun at googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 7c24ca1bda2d4df1dc9b2b982941be532d60da21)
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=84981c8a87a34c542fbff342c33226dd106e9ed0
Author: Andreas Cadhalpun <andreas.cadhalpun at googlemail.com>
Date: Tue Apr 28 20:57:59 2015 +0200
nutdec: check chapter creation in decode_info_header
This fixes a segmentation fault when accessing the metadata.
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 3ff1af2b0db7132d5717be6395227a94c8abab07)
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ac323fa46330756b60ff4338954de389d268a8fb
Author: Andreas Cadhalpun <andreas.cadhalpun at googlemail.com>
Date: Tue Apr 28 20:31:56 2015 +0200
nutdec: check for negative frame rate in decode_info_header
A negative frame rate triggers an av_assert2 in av_rescale_rnd.
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun at googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 6621105877ce0d65724a8ab60b3a50160adbe65d)
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0397e998b3aa90470f023f62e0bb034fa21b631f
Author: Michael Niedermayer <michaelni at gmx.at>
Date: Thu Apr 23 14:29:47 2015 +0200
ffmpeg: remove incorrect network deinit
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit e2877bdf3862325c2982c3237d9bf28f1bbf793f)
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=60201e27efa6bf98f9dbdf6ea18c3c91183f937f
Author: Andreas Cadhalpun <Andreas.Cadhalpun at googlemail.com>
Date: Tue Apr 28 11:13:43 2015 +0200
apedec: prevent out of array writes in decode_array_0000
s->decoded_buffer is allocated with a min_size of:
2 * FFALIGN(blockstodecode, 8) * sizeof(*s->decoded_buffer)
Then it is assigned to s->decoded[0] (and s->decoded_buffer + FFALIGN(blockstodecode, 8)
to s->decoded[1]) and passed as out buffer to decode_array_0000.
In this function 64 elements of the out buffer are written
unconditionally and outside the array if blockstodecode is too small.
This causes memory corruption, leading to segmentation faults or other
crashes.
Thus change decode_array_0000 to write at most blockstodecode elements
of the out buffer.
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun at googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 699341d647f7af785fb8ceed67604467b0b9ab12)
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=be7dc34bcf00b8c5b6503c600e7f6bc9324801ff
Author: Andreas Cadhalpun <andreas.cadhalpun at googlemail.com>
Date: Tue Apr 28 00:30:51 2015 +0200
apedec: set s->samples only when init_frame_decoder succeeded
Otherwise range_start_decoding is not necessarily run and thus
ctx->rc.range still 0 in range_dec_normalize leading to an infinite
loop.
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun at googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 464c49155ce7ffc88ed39eb2511e7a75565c24be)
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=fb5f3241e40ddcd0686e727ddf925eb9e6065406
Author: Michael Niedermayer <michaelni at gmx.at>
Date: Thu Apr 23 04:27:56 2015 +0200
tests/fate-run: do not attempt to parse tiny_psnrs output if it failed
This avoids confusing syntax errors with awk later
Likely fixes awk errors at:
http://buildd.debian-ports.org/status/fetch.php?pkg=ffmpeg&arch=sparc64&ver=7%3A2.6.2-1&stamp=1428928967
Reviewed-by: Timothy Gu <timothygu99 at gmail.com>
Thanks-to: Andreas Cadhalpun <andreas.cadhalpun at googlemail.com> for the link
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit c0d847e457c1ef72843a63853f1135d52b74131e)
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3144044e0142c3f99c181feafdfabbf9207f586b
Author: Andreas Cadhalpun <Andreas.Cadhalpun at googlemail.com>
Date: Fri Apr 24 00:01:43 2015 +0200
alac: reject rice_limit 0 if compression is used
If rice_limit is 0, k can be 0 in decode_scalar, which calls show_bits(gb, k).
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun at googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 4b657a1b1eedcf38bcf36e89a2f4be6f76b5ce09)
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=89b83042a9c5fc2a4b18dcfe7932918f6593cf2c
Author: Andreas Cadhalpun <andreas.cadhalpun at googlemail.com>
Date: Wed Apr 22 16:03:41 2015 +0200
alsdec: only adapt order for positive max_order
For max_order = 0 the clipping range is invalid. (amin = 2, amax = 1)
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun at googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 58d605ee9b3277289278dc40e022311f8e083833)
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=bb95df33a0d41087d469bebaf8be04f03dc3b397
Author: Vittorio Giovara <vittorio.giovara at gmail.com>
Date: Wed Apr 22 14:59:56 2015 +0100
lavf: Reset global flag on deinit
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 32da94fa7f73ac749e0a1e2f20499fad2f6f57fe)
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3339bae2197a2a02b090e74a8720282b5b87598e
Author: Andreas Cadhalpun <andreas.cadhalpun at googlemail.com>
Date: Wed Apr 22 16:32:42 2015 +0200
mpeg4videodec: only allow a positive length
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun at googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit b3408ae4c64cb674b1d5f0f30171759113ce722a)
Conflicts:
libavcodec/mpeg4videodec.c
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0b5405c443ec8adc3c114e508b71ce2012c83f0d
Author: Andreas Cadhalpun <Andreas.Cadhalpun at googlemail.com>
Date: Tue Apr 21 19:25:50 2015 +0200
alsdec: check sample pointer range in revert_channel_correlation
Also change the type of begin, end and smp to ptrdiff_t to make the
comparison well-defined.
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun at googlemail.com>
Reviewed-by: Thilo Borgmann <thilo.borgmann at mail.de>
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit afc7748d1f6abc4b3b1cc957b0fa6941837db3d0)
Conflicts:
libavcodec/alsdec.c
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=74e714f81597f09401252a72388cc788ed4a6a1a
Author: Michael Niedermayer <michaelni at gmx.at>
Date: Mon Apr 20 22:22:31 2015 +0200
avformat/utils: Ensure that AVFMT_FLAG_CUSTOM_IO is set before use
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit ba631b791435c395361e2026fc7419b341e57813)
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d18f8959b3c6374846c83ec28f1761e8e3253929
Author: Andreas Cadhalpun <Andreas.Cadhalpun at googlemail.com>
Date: Sat Apr 18 20:09:28 2015 +0200
alsdec: validate time diff index
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 at googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit faf9fe2c224ea81a98afd53e2f0be0a2e13aeca9)
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=455bc87c8f00abbcb2dd305b677bbe56140bd5f4
Author: Michael Niedermayer <michaelni at gmx.at>
Date: Sat Apr 18 20:50:23 2015 +0200
avcodec/alsdec: Use av_mallocz_array() for chan_data to ensure the arrays never contain random data
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 7e104647a3556fc61a139483cee1cb7dfa2dc5bd)
Conflicts:
libavcodec/alsdec.c
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=bfd65092a2b7fc1ae95e8fe79c7f0a61f25b111b
Author: Andreas Cadhalpun <andreas.cadhalpun at googlemail.com>
Date: Sat Apr 18 18:31:36 2015 +0200
alsdec: ensure channel reordering is reversible
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 at googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit ef16501aebed43e34a3721336e8bee732eca2877)
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=307c5cb9d4cc3b9373cac5b00ebdc28fc0d593fe
Author: Andreas Cadhalpun <andreas.cadhalpun at googlemail.com>
Date: Thu Apr 16 21:25:26 2015 +0200
ac3: validate end in ff_ac3_bit_alloc_calc_mask
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 at googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit bc4fee7f2a51635fa3c0f61d1e5164da1efeded3)
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=49ff079f0c0ec03cfb50e4f1198475f72cfe81f5
Author: Andreas Cadhalpun <Andreas.Cadhalpun at googlemail.com>
Date: Thu Apr 16 20:04:54 2015 +0200
aacpsy: avoid psy_band->threshold becoming NaN
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 at googlemail.com>
Reviewed-by: Claudio Freire <klaussfreire at gmail.com>
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit e224aa41917454e7b5c23d9f2541425743ce595a)
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=13178541369f73822def06170efadb180625202d
Author: Andreas Cadhalpun <andreas.cadhalpun at googlemail.com>
Date: Thu Apr 16 19:12:02 2015 +0200
aasc: return correct buffer size from aasc_decode_frame
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun at googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 0be54ad280cf114c02306b7063147e8379f8ed1e)
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=11752d17b8b4b7a8912bcb9f521045497abddfb1
Author: Andreas Cadhalpun <andreas.cadhalpun at googlemail.com>
Date: Thu Apr 16 16:58:32 2015 +0200
aacdec: consistently use avctx for logging in decode_eld_specific_config
ac may be NULL and then accessing ac->avctx results in a segmentation fault.
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun at googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 5b75689b987e4c4dd4f34d5c8be389547e9cc701)
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=12e005f7e7a91a5e7cd30c486529bbbb8b2ae210
Author: Andreas Cadhalpun <andreas.cadhalpun at googlemail.com>
Date: Thu Apr 16 14:49:08 2015 +0200
msrledec: use signed pixel_ptr in msrle_decode_pal4
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 at googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit ae6fd7300b4e9f81d3b5ba201096ffe7cccf26fb)
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=38c8264d193c0093b78a9394f06b98529ac8a433
Author: Michael Niedermayer <michaelni at gmx.at>
Date: Thu Apr 9 00:04:44 2015 +0200
avcodec/aacdec: Fix storing state before PCE decode
Fixes Ticket4460
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit e88b3852aefaa39b2170ef185ad03dda18732821)
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a43f9e6895fed3a2feb3a24491f528a3a4c153f1
Author: Timothy Gu <timothygu99 at gmail.com>
Date: Sun Nov 9 21:37:18 2014 -0800
tests: Fix test name for pixfmts tests(cherry picked from commit e1ee0521a698809ed216e9e5c11bd2bbb466ed04)
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ba7ccddb82dc9be8d272d8fa5ece6561a7025757
Author: Timothy Gu <timothygu99 at gmail.com>
Date: Mon Jun 9 21:46:37 2014 -0700
tests/fate.sh: report different status for different errors
The order of error codes will be useful in my future fateserver patches.
Signed-off-by: Timothy Gu <timothygu99 at gmail.com>
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit cc0057a31c7097839f9c4e4da61e2933b5b0e055)
Signed-off-by: Timothy Gu <timothygu99 at gmail.com>
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=dcf23f12979e355af06a2a7655019bf7c5370c5f
Author: Michael Niedermayer <michaelni at gmx.at>
Date: Sat Apr 4 18:08:23 2015 +0200
avcodec/h264_refs: Do not set reference to things which dont exist
Fixes deadlock
Fixes Ticket4428
Fixes Ticket4429
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 429de043202286a2b5bcc082cc02de860b734db2)
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=44d447f31cf97388b644e221cc60aa89083b7918
Author: Michael Niedermayer <michaelni at gmx.at>
Date: Mon Mar 30 04:37:42 2015 +0200
avutil/pca: Check for av_malloc* failures
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit dadc43eee4d9036aa532665a04720238cc15e922)
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=99a69249837079417ca8bec6dd0515ca996a748e
Author: Michael Niedermayer <michaelni at gmx.at>
Date: Tue Mar 24 15:50:12 2015 +0100
avcodec/msrledec: restructure msrle_decode_pal4() based on the line number 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 at gmx.at>
(cherry picked from commit f7e1367f58263593e6cee3c282f7277d7ee9d553)
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=09a5a754fe56dd5fd44f338d939d323d06a537ca
Author: Michael Niedermayer <michaelni at gmx.at>
Date: Sat Mar 21 12:54:16 2015 +0100
avcodec/hevc_ps: Check cropping parameters more correctly
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 06c70d45373dedc600f28e345685b130b60203c1)
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5628a5406299585c916cb4bedd768b1d370ad0fb
Author: Michael Niedermayer <michaelni at gmx.at>
Date: Thu Nov 27 15:03:35 2014 +0100
avcodec/hevc_ps: More complete window reset
Fixes out of array read
Fixes: signal_sigsegv_35bcf26_471_cov_2806540268_CAINIT_A_SHARP_4.bit
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 57e5812198aada016e9ba4149123c541f8c8a7ec)
Conflicts:
libavcodec/hevc_ps.c
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e4f32ef8063302fe791c16438a2c19a4a820814b
Author: Anton Khirnov <anton at khirnov.net>
Date: Fri Mar 20 21:28:34 2015 +0100
hevc: make the crop sizes unsigned
(cherry picked from commit c929659bdd7d2d5848ea52e685a3164c7b901bb0)
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5da5e47a1797f198190115b6bbe634b571b1b776
Author: Michael Niedermayer <michaelni at gmx.at>
Date: Thu Mar 19 23:28:39 2015 +0100
avcodec/dnxhddec: Check that the frame is interlaced before using cur_field
Fixes Ticket4227
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 2c660e34cf3c2b77cd2bef6f292920334dfd9192)
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5922e5a84eb3bcd19c09def7046a595dece989d3
Author: Michael Niedermayer <michaelni at gmx.at>
Date: Sat Mar 14 21:32:35 2015 +0100
avformat/mov: Disallow ".." in dref unless use_absolute_path is set
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 at gmx.at>
(cherry picked from commit 1e4d0498df6621143da1a550006ddc3526ad51cb)
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f000df4ce2a70bbbdfbd9efb7650f970ed65bd19
Author: Michael Niedermayer <michaelni at gmx.at>
Date: Sat Mar 14 21:24:54 2015 +0100
avformat/mov: Check for string truncation in mov_open_dref()
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 8003816e1619e77d8de051883264aa090e0d78cc)
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=88f2d31d4e929f5592ed03d5f167ce3addccbe5f
Author: Michael Niedermayer <michaelni at gmx.at>
Date: Sat Mar 14 21:23:32 2015 +0100
avformat/mov: Use sizeof(filename) instead of a literal number
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 21a53dd08dce7cc5b3fdf9c4826b4b74d8300ea0)
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=eface550b9d3cc8f6b01d709af53e206257f04ae
Author: Rainer Hochecker <fernetmenta at online.de>
Date: Thu Mar 12 14:08:25 2015 +0100
hevc: delay ff_thread_finish_setup for hwaccel
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 31816eae32019ff0e2243533f618efa2a4da9c33)
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=2aa21e8d95517893d75e0056c7a07218884ac356
Author: Andreas Cadhalpun <Andreas.Cadhalpun at googlemail.com>
Date: Sun Mar 8 23:12:59 2015 +0100
ffmdec: make sure the time base is valid
A negative time base can trigger assertions.
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun at googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 4c91d81be23ffacfa3897b2bcfa77445bb0c2f89)
Conflicts:
libavformat/ffmdec.c
(cherry picked from commit 9678ceb6976ca8194848b24535785a298521211f)
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=95d92601771b8a27b99c0142fe9fc6fb08f3a582
Author: Michael Niedermayer <michaelni at gmx.at>
Date: Tue Mar 10 19:18:34 2015 +0100
avcodec/012v: redesign main loop
Fixes out of array accesses
Fixes: ffmpeg_012v_crash.ts
Found-by: Thomas Lindroth <thomas.lindroth at gmail.com>
Reviewed-by: Thomas Lindroth <thomas.lindroth at gmail.com>
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 48df30d36c3ca360c407d84f96749888d1fbe853)
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=560b3895387ea1a4538f7cf4d3efe0cebac44937
Author: Michael Niedermayer <michaelni at gmx.at>
Date: Tue Mar 10 20:21:14 2015 +0100
avcodec/012v: Check dimensions more completely
Fixes division by 0
Found-by: Thomas Lindroth <thomas.lindroth at gmail.com>
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit d3b25383daffac154846daeb4e4fb46569e728db)
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=436f530a51abb194548d0a2d635b0c3415d6ebb6
Author: Martin Storsjö <martin at martin.st>
Date: Thu Mar 5 23:38:00 2015 +0200
arm: Suppress tags about used cpu arch and extensions
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 at martin.st>
(cherry picked from commit dcae2e32f7d8a1ca5fb8c1e4aa81313be854dd73
and b77e335e441040a40fc6156b8e4a134745d10233)
Signed-off-by: Martin Storsjö <martin at martin.st>
(cherry picked from commit 9841654c158c80e9d525ba03754135d3f34e306e)
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0b25a4d253baa8f6b786b04b4417824857e2eb73
Author: Xiaohan Wang <xhwang at chromium.org>
Date: Thu Nov 6 12:59:54 2014 -0800
Fix read-after-free in matroska_read_seek().
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 at gmx.at>
(cherry picked from commit 33301f001747d7a542073c634cc81da5eff051cf)
Conflicts:
libavformat/matroskadec.c
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=41dffa883a176d5c9bfea2b144241a160924d524
Author: Andreas Cadhalpun <Andreas.Cadhalpun at googlemail.com>
Date: Mon Mar 9 19:24:09 2015 +0100
roqvideoenc: set enc->avctx in roq_encode_init
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 at googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit cf82c426fadf90105e1fb9d5ecd267cc3aa2b288)
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=fa5ec2c354afce694a8f69687ffd72db21069ba1
Author: Michael Niedermayer <michaelni at gmx.at>
Date: Mon Mar 9 03:42:00 2015 +0100
avcodec/options_table: remove extradata_size from the AVOptions table
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 at googlemail.com>
Reviewed-by: Lukasz Marek <lukasz.m.luki2 at gmail.com>
Reviewed-by: Nicolas George <george at nsup.org>
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 1f4088b28540080ce1d42345c5614be3e1a6a197)
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=907d7d972ada4eb4da59fd2db97442d2f865f270
Author: Andreas Cadhalpun <Andreas.Cadhalpun at googlemail.com>
Date: Mon Mar 9 14:59:44 2015 +0100
ffmdec: limit the backward seek to the last resync position
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 at googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 6b8263b03ab3d16d70525ae1893cb106be7852f1)
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9a52cbdb00975110b3b66289bdbfd40fc960a23c
Author: Andreas Cadhalpun <Andreas.Cadhalpun at googlemail.com>
Date: Sun Mar 8 23:31:48 2015 +0100
ffmdec: fix infinite loop at EOF
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 at googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 6fa98822eba501a4898fdec5b75acd3026201005)
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=61d5ec7c32b8b35e9712c27da9c74100b4cd089d
Author: Andreas Cadhalpun <Andreas.Cadhalpun at googlemail.com>
Date: Mon Mar 2 15:46:44 2015 +0100
avformat/rm: limit packet size
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 at googlemail.com>
See Ticket244
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 08728f400b8367dc8c983036cb2eff3a2891322b)
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3f5a2831744c3e55261ca5e2a6d05f7a87143b33
Author: Andreas Cadhalpun <Andreas.Cadhalpun at googlemail.com>
Date: Mon Mar 2 20:47:57 2015 +0100
avcodec/webp: validate the distance prefix code
According to the WebP Lossless Bitstream Specification the highest
allowed value for a prefix code is 39.
If prefix_code is too large, the calculated extra_bits has an invalid
value and triggers an assertion in get_bits.
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun at googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 5de2dab12b951b2fe121eb18503accfc91cd1565)
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=66a1ed96bf3d5a6755a24769f29075618ec6131a
Author: Andreas Cadhalpun <Andreas.Cadhalpun at googlemail.com>
Date: Mon Mar 2 20:27:26 2015 +0100
avcodec/rv10: check size of s->mb_width * s->mb_height
If it doesn't fit into 12 bits it triggers an assertion.
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun at googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 2578a546183da09d49d5bba8ab5e982dece1dede)
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0b84dbeca95dd1470b6f74d4af2cac55a26d12db
Author: Federico Tomassetti <ftomassetti at groupon.com>
Date: Wed Feb 18 12:11:43 2015 +0000
mdec: check for out of bounds read
Bug-Id: CID 1257501
CC: libav-stable at libav.org
Signed-off-by: Luca Barbato <lu_zero at gentoo.org>
(cherry picked from commit 2c63081b48d98f3a0d0bed7b0ec3c0347b99144c)
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=803db3b6fe86036b8860f62c8f385595bb01f5e9
Author: Vittorio Giovara <vittorio.giovara at gmail.com>
Date: Fri Feb 27 19:00:25 2015 +0000
aic: Fix decoding files with odd dimensions
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 at libav.org
(cherry picked from commit e878ec0d47cd6228c367b2f3128b76d7523f7255)
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6e43bb2dc29c1257256501c0c85668391a4a651c
Author: Michael Niedermayer <michaelni at gmx.at>
Date: Sun Mar 8 23:27:43 2015 +0100
avcodec/tiff: move bpp check to after "end:"
This ensures that all current and future code-pathes get bpp checked
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit d5e9fc782150d4596c72440a0aa02b7f4f1254b1)
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3f30c49f7ed0f16a33589b2db1df6c8ba2a10366
Author: Michael Niedermayer <michaelni at gmx.at>
Date: Sat Mar 7 14:30:34 2015 +0100
avcodec/utils: Align YUV411 by as much as the other YUV variants
Fixes out of array accesses
Fixes: ffmpeg_mjpeg_crash2.avi
Found-by: Thomas Lindroth <thomas.lindroth at gmail.com>
Tested-by: Thomas Lindroth <thomas.lindroth at gmail.com>
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit e3201c38d53d2b8b24d0bc95d726b2cb1752dc12)
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=dc2d15360cd7a266feff5f2c0980c187aba8c5ab
Author: Andreas Cadhalpun <Andreas.Cadhalpun at googlemail.com>
Date: Thu Mar 5 22:48:28 2015 +0100
webp: ensure that each transform is only used once
According to the WebP Lossless Bitstream Specification
"each transform is allowed to be used only once".
If a transform is more than once this can lead to memory
corruption.
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit c089e720c1b753790c746a13053636d7facf6bf0)
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=86c024ea9e65f9c4c0b01f02712f4fd7313371e7
Author: Andreas Cadhalpun <Andreas.Cadhalpun at googlemail.com>
Date: Sat Feb 28 20:58:31 2015 +0100
avformat/flvenc: check that the codec_tag fits in the available bits
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 at gmx.at>
(cherry picked from commit e8565d21c276ab9ac5ce785549420321fbd0b093)
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0b0a8cd133c711e6d74a57a3fa1d8eaa28b74ce8
Author: Michael Niedermayer <michaelni at gmx.at>
Date: Fri Feb 27 03:12:23 2015 +0100
swscale/utils: clear formatConvBuffer on allocation
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 at gmx.at>
(cherry picked from commit 007498fc1a639ecee2cda1892cbcff66c7c8c951)
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=dfc3cd73ff5554045b8035221c8f24d8a708717b
Author: Michael Niedermayer <michaelni at gmx.at>
Date: Wed Feb 11 03:33:53 2015 +0100
avcodec/mjpegdec: Skip blocks which are outside the visible area
Fixes out of array accesses
Fixes: ffmpeg_mjpeg_crash.avi
Found-by: Thomas Lindroth <thomas.lindroth at gmail.com>
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 08509c8f86626815a3e9e68d600d1aacbb8df4bf)
Conflicts:
libavcodec/mjpegdec.c
(cherry picked from commit 0861bb66d7c281c92a0746167bb141735a660856)
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=8a9d5a8140d523ca7960396f57e96d5bf1803f15
Author: Andreas Cadhalpun <Andreas.Cadhalpun at googlemail.com>
Date: Thu Feb 26 21:42:02 2015 +0100
avformat/bit: only accept the g729 codec and 1 channel
Other codecs/channel numbers are not supported by this muxer.
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun at googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit d0b8640f75ff7569c98d6fdb03d83451104e088c)
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=81196b6d6018c8a303ad0c7ad28307b3c1c685d8
Author: Andreas Cadhalpun <Andreas.Cadhalpun at googlemail.com>
Date: Thu Feb 26 21:38:50 2015 +0100
avformat/bit: check that pkt->size is 10 in write_packet
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 at googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit eeda2c3de8a8484d9e7d1e47ac836bec850b31fc)
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=cd74b344c23572080a47e22eb09e380cbbddb0e0
Author: Andreas Cadhalpun <Andreas.Cadhalpun at googlemail.com>
Date: Wed Feb 25 22:55:44 2015 +0100
avformat/adxdec: check avctx->channels for invalid values
This avoids a null pointer dereference of pkt->data.
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun at googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 7faa40af982960608b117e20fec999b48011e5e0)
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b49f8de4ec33e8c8c599b5fba00416f2935ff4a7
Author: Dyami Caliri <dyami at dragonframe.com>
Date: Thu Feb 26 10:17:01 2015 -0800
Fix buffer_size argument to init_put_bits() in multiple encoders.
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
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=11141fb9ff3258c0e2563a984e358d7d71ed0467
Author: James Cowgill <james410 at cowgill.org.uk>
Date: Thu Feb 26 13:42:52 2015 +0000
mips/acelp_filters: fix incorrect register constraint
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 at cowgill.org.uk>
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit b9de1303a6414174ab2f3bccefa801bfabcf0f88)
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c417b7b5663b85b054fea44f9e917f3ced20d1c3
Author: Michael Niedermayer <michaelni at gmx.at>
Date: Wed Feb 25 15:51:28 2015 +0100
avcodec/hevc_ps: Sanity checks for some log2_* values
log2 values which imply numeric overflow are not supported
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 205b2ba3d677330e023aac2f4bd3f624039256b9)
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=41ca0489ba9276c2f716863384742a04358423eb
Author: Michael Niedermayer <michaelni at gmx.at>
Date: Wed Feb 25 12:29:10 2015 +0100
avcodec/zmbv: Check len before reading in decode_frame()
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 at gmx.at>
(cherry picked from commit 1f5c7781e63d6519192ada59c1e36bcecc92791d)
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=232b1f83de57057821ef2730ec9f39268cf6d015
Author: Michael Niedermayer <michaelni at gmx.at>
Date: Tue Feb 24 20:49:07 2015 +0100
avcodec/h264: Only reinit quant tables if a new PPS is allowed
Fixes null pointer dereference
Fixes: signal_sigsegv_3042097_3007_cov_1741463594_non_monotone_timestamps1.mkv
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit c23a0e77dd492d6c794f89dbff3a438c95745e70)
Conflicts:
libavcodec/h264_slice.c
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7afb16c9a1c8d6e04d7ba084d1cd6b8557805d72
Author: Michael Niedermayer <michaelni at gmx.at>
Date: Tue Feb 24 03:12:22 2015 +0100
avcodec/snowdec: Fix ref value check
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 at gmx.at>
(cherry picked from commit 8f4cbf940212079a34753c7f4d6c6b5a43586d30)
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a79e5c994cf9af9cdd527fd9a2f7b8f9e02e84b0
Author: Michael Niedermayer <michaelni at gmx.at>
Date: Tue Feb 24 00:32:39 2015 +0100
swscale/utils: More carefully merge and clear coefficients outside the input
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 at gmx.at>
(cherry picked from commit 1895d414aaacece3b57d7bf19502305e9a064fae)
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1a8f9f0e589892f3d2d6f08e8fb3592d709bfb96
Author: Andreas Cadhalpun <Andreas.Cadhalpun at googlemail.com>
Date: Sun Feb 22 20:48:38 2015 +0100
avcodec/a64multienc: fix use of uninitialized values in to_meta_with_crop
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 at gmx.at>
(cherry picked from commit 87513d654546a99f8ddb045ca4fa5d33778a617e)
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=91ced1608cf4e2a8f8c6b26884a39a368c8cde79
Author: Michael Niedermayer <michaelni at gmx.at>
Date: Mon Feb 23 01:21:30 2015 +0100
avcodec/a64multienc: don't set incorrect packet size
This fixes invalid reads of the packet buffer in av_dup_packet
Based on patch by Andreas Cadhalpun <andreas.cadhalpun at googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit d96142e9af92ded84f2580620c571ab96c4bb657)
Conflicts:
libavcodec/a64multienc.c
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d0da72ebb04a1812433099c8effd8f753a4f7e61
Author: Andreas Cadhalpun <Andreas.Cadhalpun at googlemail.com>
Date: Sun Feb 22 20:43:30 2015 +0100
avcodec/a64multienc: use av_frame_ref instead of copying the frame
This fixes freeing the frame buffer twice on cleanup leading to a crash.
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 39e4ed7c1d8d840be47f6d604704d47a59a9ae5d)
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b62a3478e92be87e2b508b9aae6f86b20db9f9e2
Author: Michael Niedermayer <michaelni at gmx.at>
Date: Thu Feb 19 16:25:29 2015 +0100
avcodec/x86/mlpdsp_init: Simplify mlp_filter_channel_x86()
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 at gmail.com>
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 03f39fbb2a558153a3c464edec1378d637a755fe)
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d005972995ee9b13ca6573a396cdb70808e12814
Author: Anton Khirnov <anton at khirnov.net>
Date: Thu Feb 12 13:06:49 2015 +0100
h264: initialize H264Context.avctx in init_thread_copy
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 at gmx.at>
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=94ebfef2fb69f9bc66dc17e533c5d25d68a37924
Author: Michael Niedermayer <michaelni at gmx.at>
Date: Fri Feb 20 21:01:54 2015 +0100
avformat/omadec: Use 64bit for ret to avoid overflow
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 0f55bc29d41585d110b126cb4ed4b395fd46d7ac)
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f8b6ba5574c73c87ebf4be178a319e2e2d278749
Author: Michael Niedermayer <michaelni at gmx.at>
Date: Fri Feb 20 21:00:57 2015 +0100
avformat/vqf: Use 64bit for ret to avoid overflow
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit cb08687180683a755d0fe9d425280d0e4d1e6db2)
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3b17f32ec3cca0f9f1593f8bfce18a91a128e5ce
Author: Michael Niedermayer <michaelni at gmx.at>
Date: Fri Feb 20 20:41:35 2015 +0100
avformat/mvdec: Use 64bit for ret to avoid overflow
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 26c0cc154e06cb0064b3a3da49447ac44d82444f)
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1480d9b3d39b8f4ba4f9a327c2f7d492118f75ad
Author: Michael Niedermayer <michaelni at gmx.at>
Date: Fri Feb 20 20:14:56 2015 +0100
avformat/gxf: Use 64bit for res to avoid overflow
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 12987f89007ee82b9d3a6090085dfaef8461ab8b)
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1aea2213a68674b61f09bcde2a4ff94fb9d586a4
Author: Michael Niedermayer <michaelni at gmx.at>
Date: Fri Feb 20 20:13:06 2015 +0100
avformat/idcin: Use 64bit for ret to avoid overflow
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit d1923d15a3544cbb94563a59e7169291db76b312)
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6ab48096f5bdd2a3218052bf65f919b8780d2c7d
Author: Michael Niedermayer <michaelni at gmx.at>
Date: Sat Feb 7 03:34:48 2015 +0100
avcodec/h264_slice: ignore SAR changes in slices after the first
Fixes race condition and null pointer dereference
Fixes: signal_sigsegv_1472ac3_468_cov_2915641226_CABACI3_Sony_B.jsv
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 38d5241b7f36c1571a88517a0650caade16dd5f4)
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
Conflicts:
libavcodec/h264_slice.c
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6c67cc2ad119493f3258241f64ea49cb87d07112
Author: Michael Niedermayer <michaelni at gmx.at>
Date: Sat Feb 7 02:22:44 2015 +0100
avcodec/h264_slice: Check picture structure before setting the related fields
This might fix a hypothetical race condition
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit f111831ed61103f9fa8fdda41473a23da016bdaa)
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
Conflicts:
libavcodec/h264_slice.c
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=cab930604011477d27eab7738c3e26f3bba8b132
Author: Michael Niedermayer <michaelni at gmx.at>
Date: Sat Feb 7 02:06:20 2015 +0100
avcodec/h264_slice: Do not change frame_num after the first slice
Fixes potential race condition
Fixes: signal_sigsegv_1472ac3_468_cov_2915641226_CABACI3_Sony_B.jsv
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit f906982c9411f3062e3ce68013309b37c213c4dd)
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
Conflicts:
libavcodec/h264_slice.c
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=01e2e746bad3a5a498703ae8b82812e140db1157
Author: Michael Niedermayer <michaelni at gmx.at>
Date: Fri Feb 6 15:09:54 2015 +0100
avcodec/h264: Be more strict on rejecting pps/sps changes
Fixes race condition
Fixes: signal_sigsegv_1472ac3_468_cov_2915641226_CABACI3_Sony_B.jsv
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 6fafc62b0bd0e206deb77a7aabbf3a370ad80789)
Conflicts:
libavcodec/h264.c
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=17ecc8a7716e9ac610a2226baceaeade0c82d2a4
Author: Michael Niedermayer <michaelni at gmx.at>
Date: Fri Feb 6 04:11:56 2015 +0100
avcodec/h264_ps: More completely check the bit depths
Fixes out of array read
Fixes: asan_static-oob_30328b6_719_cov_3325483287_H264_artifacts_motion.h264
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 69aa79365c1e8e1cb597d33e77bf1062c2ef47d4)
Conflicts:
libavcodec/h264_ps.c
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=07a55344e636dac584a6f7c6e468b53bd8c3a56d
Author: Michael Niedermayer <michaelni at gmx.at>
Date: Thu Feb 5 03:45:21 2015 +0100
avformat/thp: Check av_get_packet() for failure not only for partial output
Fixes null pointer dereference
Fixes: signal_sigsegv_db2c1f_3108_cov_163322880_pikmin2_opening1_partial.thp
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit f2579dbb4b31e6ae731e7f5555680528ef3020ab)
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=813054c4bd5d47fc9b2b45fa53c020239af66b70
Author: Michael Niedermayer <michaelni at gmx.at>
Date: Thu Feb 5 00:12:08 2015 +0100
swscale/utils: Limit filter shifting so as not to read from prior the array
Fixes out of array read
Fixes: asan_heap-oob_1fb2f9b_3780_cov_3984375136_usf.mkv
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 692b22626ec9a9585f667c124a186b1a9796e432)
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b844584c10170e47654d7f8d58d8126cde62e8ba
Author: Michael Niedermayer <michaelni at gmx.at>
Date: Wed Feb 4 20:13:18 2015 +0100
avcodec/mjpegdec: Check escape sequence validity
Fixes assertion failure
Fixes: asan_heap-oob_1c1a4ea_1242_cov_2274415971_TESTcmyk.jpg
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a6ba4c1116c16c01a2faf188d47c9ed7bb727a06
Author: Michael Niedermayer <michaelni at gmx.at>
Date: Wed Feb 4 20:48:30 2015 +0100
avcodec/mjpegdec: Check number of components for JPEG-LS
Fixes out of array accesses
Fixes: asan_heap-oob_1c1a4ea_1242_cov_2274415971_TESTcmyk.jpg
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit fabbfaa095660982cc0bc63242c459561fa37037)
Conflicts:
libavcodec/mjpegdec.c
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=af0544ca3d40d1277dec1175a1939a74c5b12ce4
Author: Michael Niedermayer <michaelni at gmx.at>
Date: Wed Feb 4 14:47:41 2015 +0100
avformat/mpc8: Use uint64_t in *_get_v() to avoid undefined behavior
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 05e161952954acf247e0fd1fdef00559675c4d4d)
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=55b75ece704395b5580dabcd3f426f51ed82ee3c
Author: wm4 <nfxjfg at googlemail.com>
Date: Tue Feb 3 19:04:11 2015 +0100
avformat/mpc8: fix broken pointer math
This could overflow and crash at least on 32 bit systems.
Reviewed-by: Reimar Döffinger <Reimar.Doeffinger at gmx.de>
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit b737a2c52857b214be246ff615c6293730033cfa)
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=28f303542e90bc34f96e2e04af6f1b9e9b9d65ab
Author: wm4 <nfxjfg at googlemail.com>
Date: Tue Feb 3 19:04:12 2015 +0100
avformat/mpc8: fix hang with fuzzed file
This can lead to an endless loop by seeking back a few bytes after each
attempted chunk read. Assuming negative sizes are always invalid, this
is easy to fix. Other code in this demuxer treats negative sizes as
invalid as well.
Fixes ticket #4262.
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 56cc024220886927350cfc26ee695062ca7ecaf4)
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6e7f183ae632f160638203c4a9302c25f1bc7bc6
Author: wm4 <nfxjfg at googlemail.com>
Date: Tue Feb 3 14:41:10 2015 +0100
avformat/tta: fix crash with corrupted files
av_add_index_entry() can fail, for example because the parameters are
invalid, or because memory allocation fails. Check this; it can actually
happen with corrupted files.
The second hunk is just for robustness. Just in case functions like
ff_reduce_index() remove entries. (Not sure if this can actually
happen.)
Fixes ticket #4294.
Reviewed-by: Paul B Mahol <onemda at gmail.com>
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 6a0cd529a35190d9374b0b26504e71857cd67b83)
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=37723e0d0c3e9ac137ba53c2f02912a27ed97a7a
Author: Michael Niedermayer <michaelni at gmx.at>
Date: Sun Feb 1 19:40:13 2015 +0100
avcodec/mpegvideo_enc: Fix number suffixes in rc_buffer_size calculation
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 4531e2c489d279bfc90d54ca26ed898c5b265a7f)
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5feffd62688b61d7e9c2aff63e7fbf3c0cd9b04c
Author: Michael Niedermayer <michaelni at gmx.at>
Date: Sun Feb 1 19:39:22 2015 +0100
avcodec/h264_cabac: use int instead of long for mbb_xy
The mb address fits in int
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 592ba6ec106206f97133c9345313010c76361e12)
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6862970dbfd81a86afcf6d57cafab60e01e2c8e5
Author: Michael Niedermayer <michaelni at gmx.at>
Date: Sun Feb 1 19:36:36 2015 +0100
avformat/omadec: fix number suffix
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit f1f7f5903ab49b84789af5341492afbaba808a70)
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=633ce6baaaabc44d619b890c8afacb1e906bc2bb
Author: Michael Niedermayer <michaelni at gmx.at>
Date: Sun Feb 1 19:36:13 2015 +0100
avformat/smacker: Fix number suffix
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 465f3705b1ef832fd6904750d018f81f9044f3ab)
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=201d626bb90ea3ca22f0168b8e2085bbd16ac984
Author: Michael Niedermayer <michaelni at gmx.at>
Date: Sun Feb 1 19:34:52 2015 +0100
avformat/matroskadec: Fix number suffixes
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit fc3cdb00d084222a107e61e7168903bf3d3d0b47)
Conflicts:
libavformat/matroskadec.c
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=364bdddaad04f3adafd7699dd5cb739e14b3c90a
Author: Michael Niedermayer <michaelni at gmx.at>
Date: Sun Feb 1 19:27:00 2015 +0100
swresample/dither: Cleanup number suffixes
The <<31 case needs LL
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit c77cc2c1766666cdb5f14daee0f75e397bf7a194)
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e651a2f88c219e74c9851563e74100f7652a6005
Author: Michael Niedermayer <michaelni at gmx.at>
Date: Sun Feb 1 19:19:25 2015 +0100
avformat/utils: Fix number suffixes in tb_unreliable()
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 4b15bba2aec93776bfdc69a1bca42a4795a7d191)
Conflicts:
libavformat/utils.c
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7c54f1416859e6fb3a5f72efc6b002642abfff02
Author: Michael Niedermayer <michaelni at gmx.at>
Date: Sat Dec 6 00:18:29 2014 +0100
avformat/rmdec: Check for overflow in ff_rm_read_mdpr_codecdata()
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 03abf55f252945c70f4a79eaf4d609cee4d98710)
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d00e2fa28410f8eb088bd2a1653946284ab81856
Author: Vittorio Giovara <vittorio.giovara at gmail.com>
Date: Wed Dec 17 16:02:07 2014 +0100
swscale: check memory allocations
Bug-Id: CID 1257779
(cherry picked from commit 1dd797e3c9f179f957316a0becbec048b42df8aa)
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9d156e24d779702850d6c66893837534b18dd3ea
Author: Michael Niedermayer <michaelni at gmx.at>
Date: Sat Jan 17 01:56:03 2015 +0100
avcodec/flac_parser: fix handling EOF if no headers are found
Fixes assertion failure
Fixes Ticket4269
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit c4d85fc23c100f7a27d9bad710eb153214868e27)
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ccca7ae8c6dba1a98d6ecfb1c6ae2f5c2bb32253
Author: Michael Niedermayer <michaelni at gmx.at>
Date: Thu Jan 8 23:02:30 2015 +0100
ffmpeg: Clear error message array at init.
This avoids printing uninitialized bytes if no error message is set
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 6d1a2efb8ac399a003ea7d3b6f8c641d192567ee)
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5a98a000018e0563ddf3316d1594cc438b0c696e
Author: wm4 <nfxjfg at googlemail.com>
Date: Thu Jan 8 17:19:17 2015 +0100
avcodec/dvdsubdec: fix accessing dangling pointers
dvdsub_decode() can call append_to_cached_buf() 2 times, the second time
with ctx->buf as argument. If the second append_to_cached_buf() reallocs
ctx->buf, the argument will be a pointer to the previous, freed block.
This can cause invalid reads at least with some fuzzed files - and
possibly with valid files.
Since packets can apparently not be larger than 64K (even if packets are
combined), just use a fixed size buffer. It will be allocated as part of
the DVDSubContext, and although some memory is "wasted", it's relatively
minimal by modern standards and should be acceptable.
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 816577716bc6170bccfea3b9e865618b69a4b426)
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f04b323a460fd026d1cab31ad82464d34d5d2011
Author: wm4 <nfxjfg at googlemail.com>
Date: Wed Jan 7 23:57:50 2015 +0100
avcodec/dvdsubdec: error on bitmaps with size 0
Attemtping to decode them could lead to invalid writes with some fuzzed
samples.
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit bcaa9099b3648b47060e1724a97dc98b63c83702)
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e4fddd18e7f4bf666f598a608d63dd16c3da41f4
Author: Johan Andersson <j at i19.se>
Date: Sat Jan 3 17:31:36 2015 +0100
cmdutils: update copyright year to 2015.
(cherry picked from commit 3e160652219ff4da433f5672ae1e5f4956abb815)
Conflicts:
cmdutils.c
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=36ac58454832032623ca9584bbdbc837a02a8bcc
Author: Michael Niedermayer <michaelni at gmx.at>
Date: Tue Jan 6 19:51:38 2015 +0100
avformat/mov: Fix mixed declaration and statement warning
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit db27f50e0658e91758e8a17fdcf390e6bc93c1d2)
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=fa0194e9ca704d1b6f8f85762f513202bde6482d
Author: Michael Niedermayer <michaelni at gmx.at>
Date: Tue Jan 6 12:53:53 2015 +0100
avformat/utils: Clear pointer in ff_alloc_extradata() to avoid leaving a stale pointer in memory
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit bbfca8e84b0e69abba523d665536c0135fc1c00e)
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=83700aced1917f372f453eea1cc6543aeae2c2a1
Author: Michael Niedermayer <michaelni at gmx.at>
Date: Tue Jan 6 12:48:38 2015 +0100
avformat/matroskadec: Use av_freep() to avoid leaving stale pointers in memory
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 6e70e4aca50696040cc9256ec96e5c31d9641432)
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ac1905cd5bffd423f666729954b06ce7c148d3f4
Author: Paul B Mahol <onemda at gmail.com>
Date: Tue Jan 6 09:42:59 2015 +0000
lavfi: check av_strdup() return value
Signed-off-by: Paul B Mahol <onemda at gmail.com>
(cherry picked from commit 145a84717b62e086cdb5f26649ad9f1b51ef38d0)
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=13d4d8a9c6bb6acdec8be0638299d0ce08bfd061
Author: Dale Curtis <dalecurtis at chromium.org>
Date: Mon Jan 5 16:34:17 2015 -0800
mov: Fix negative size calculation in mov_read_default().
The previous code assumed if an atom was marked with a 64-bit
size extension, it actually had that data available. The new
code verfies there's enough data in the atom for this to be
done.
Failure to verify causes total_size > atom.size which will
result in negative size calculations later on.
Found-by: Paul Mehta <paul at paulmehta.com>
Signed-off-by: Dale Curtis <dalecurtis at chromium.org>
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 3ebd76a9c57558e284e94da367dd23b435e6a6d0)
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=71d0cfff15ea89b63124a9eaf8032c27d7f2a99a
Author: Michael Niedermayer <michaelni at gmx.at>
Date: Tue Jan 6 04:29:10 2015 +0100
avformat/mov: fix integer overflow in mov_read_udta_string()
Found-by: Paul Mehta <paul at paulmehta.com>
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 3859868c75313e318ebc5d0d33baada62d45dd75)
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6832b1fde7b6c324362b908aafc3a74577987c07
Author: Dale Curtis <dalecurtis at chromium.org>
Date: Mon Jan 5 16:19:09 2015 -0800
mov: Avoid overflow with mov_metadata_raw()
The code previously added 1 to len without checking its size,
resulting in an overflow which can corrupt value[-1] -- which
may be used to store unaligned ptr information for certain
allocators.
Found-by: Paul Mehta <paul at paulmehta.com>
Signed-off-by: Dale Curtis <dalecurtis at chromium.org>
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0bdbf1aba3b155e14c7223302e6e2e9615e17d38
Author: wm4 <nfxjfg at googlemail.com>
Date: Mon Jan 5 04:45:26 2015 +0100
avcodec/dvdsubdec: fix out of bounds accesses
The code blindly trusted buffer offsets read from the file in the RLE
decoder. Explicitly check the offset. Also error out on other RLE
decoding errors.
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit c9151de7c42553bb145be608df8513c1287f1f24)
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=19475c0d749c8d056cb41cb158fcc0a2c72eeb00
Author: Michael Niedermayer <michaelni at gmx.at>
Date: Sun Jan 4 01:03:26 2015 +0100
avfilter/vf_sab: fix filtering tiny images
Fixes out of array reads
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 9bff052b51f27f6cce04e8d7d8b405c710d7ad67)
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=bfdf15943d65a6278dd5639ab46259b4f8a28355
Author: Michael Niedermayer <michaelni at gmx.at>
Date: Thu Jan 1 18:15:16 2015 +0100
avformat/flvdec: Increase string array size
Fixes parsing httphostheader of Scarlatti\,\ Pieter-Jan\ Belder\ -\ Sonata\ K113\ in\ A\ major\ -\ Alle.flv
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit eb767a276bfdb9a0493bdb0b38203638230b7ccb)
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=fbc998ce3f907f642c1536d6b7a9d9a06f70785a
Author: Michael Niedermayer <michaelni at gmx.at>
Date: Thu Jan 1 18:07:24 2015 +0100
avformat/flvdec: do not inject dts=0 metadata packets which failed to be parsed into a new data stream
Such data streams (which then contain no other packets except the faulty one)
confuse some user applications, like VLC
Works around vlcticket 12389
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 322f0f5960a743cac47252d90a0f1ea7a025feff)
Conflicts:
libavformat/flvdec.c
More information about the ffmpeg-cvslog
mailing list