MPV

~mpv-team/mpv/+git/ffmpeg:release/2.1

  1. Git
  2. lp:~mpv-team/mpv/+git/ffmpeg
  3. release/2.1
Last commit made on 2016-03-03
Get this branch:
git clone -b release/2.1 https://git.launchpad.net/~mpv-team/mpv/+git/ffmpeg

Branch merges

Branch information

Name:
release/2.1
Repository:
lp:~mpv-team/mpv/+git/ffmpeg

Recent commits

a9a5f5b... by Paul B Mahol <email address hidden>

doc/utils: fix typo for min() description

Signed-off-by: Paul B Mahol <email address hidden>
(cherry picked from commit bdf474bcff29f5b40fe14f6fa1dbe10e69c73ab7)
Signed-off-by: Timothy Gu <email address hidden>

00c016a... by Michael Niedermayer <email address hidden>

swscale/x86/rgb2rgb_template: Do not crash on misaligend stride

Fixes Ticket5013

Signed-off-by: Michael Niedermayer <email address hidden>
(cherry picked from commit 80bfce35ccd11458e97f68f417fc094c5347070c)

65f4425... by Michael Niedermayer <email address hidden>

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 <email address hidden>
(cherry picked from commit e04126072e984f8db5db9da9303c89ae01f7d6bb)

Fixes ticket #5052.

d9593e0... by Michael Niedermayer <email address hidden>

avcodec/ffv1dec: Print an error if the quant table count is invalid

Signed-off-by: Michael Niedermayer <email address hidden>
(cherry picked from commit a8b254e436dce2f5c8c6459108dab4b02cc6b79b)

fde9b80... by Michael Niedermayer <email address hidden>

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 <email address hidden>
(cherry picked from commit 5745cf799a4389bc5d14f2b4daf32fe4631c50bc)

32ba667... by Andrey Utkin <email address hidden>

doc/filters/drawtext: fix centering example

Signed-off-by: Andrey Utkin <email address hidden>
Signed-off-by: Lou Logan <email address hidden>
(cherry picked from commit 648b26acc5e25ab40c43fddc54b50e9f0b13ebd8)
Signed-off-by: Timothy Gu <email address hidden>

2061298... by Ronald S. Bultje

videodsp: don't overread edges in vfix3 emu_edge.

Fixes trac ticket 3226. Also see Andreas' analysis in
https://bugs.debian.org/801745, which was very helpful.
(cherry picked from commit 52f84d82bdf1851ecfcc412c1719e5f6f3396209)

50ac23f... by Michael Niedermayer <email address hidden>

avcodec/h264_mp4toannexb_bsf: Reorder operations in nal_size check

Fixes Ticket4778

Signed-off-by: Michael Niedermayer <email address hidden>
(cherry picked from commit 2bb54b82b5094fd906aa28c0443be08c95662a31)

01fa1dc... by Michael Niedermayer <email address hidden>

avformat/oggenc: Check segments_count for headers too

Fixes infinite loop and segfault in ogg_buffer_data()
Fixes Ticket4806

Signed-off-by: Michael Niedermayer <email address hidden>
(cherry picked from commit 81a8701eb52d2b6469ae16ef442ce425388141b7)

f3dfb14... by Michael Niedermayer <email address hidden>

avformat/avidec: Workaround broken initial frame

Fixes Ticket4851

Signed-off-by: Michael Niedermayer <email address hidden>
(cherry picked from commit 3e2ef00394b8079e93835d47c993868229f07502)