MPV

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

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

Branch merges

Branch information

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

Recent commits

9526ad4... by Michael Niedermayer <email address hidden>

MAINTAINERS: Remove myself as leader

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

Signed-off-by: Michael Niedermayer <email address hidden>

6f4cda4... by Michael Niedermayer

Update for 0.7.17

Signed-off-by: Michael Niedermayer <email address hidden>

98b0751... by Michael Niedermayer

h264/cabac: check loop index

fix out of array read

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <email address hidden>
(cherry picked from commit cdf0877bc341684c56ac1fe057397adbadf329ee)

Signed-off-by: Michael Niedermayer <email address hidden>

a83b9f3... by Andreas Cadhalpun

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 <email address hidden>
Signed-off-by: Michael Niedermayer <email address hidden>
(cherry picked from commit cf82c426fadf90105e1fb9d5ecd267cc3aa2b288)

Signed-off-by: Michael Niedermayer <email address hidden>

5333edc... by Michael Niedermayer

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

Conflicts:

 libavcodec/tiff.c

bd92af6... by Michael Niedermayer

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 <email address hidden>
Tested-by: Thomas Lindroth <email address hidden>
Signed-off-by: Michael Niedermayer <email address hidden>
(cherry picked from commit e3201c38d53d2b8b24d0bc95d726b2cb1752dc12)

Conflicts:

 libavcodec/utils.c

c681f86... by Dyami Caliri <email address hidden>

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

Conflicts:

 libavcodec/faxcompr.c
 libavcodec/s302menc.c

Conflicts:

 libavcodec/adpcmenc.c

Conflicts:

 libavcodec/adpcmenc.c
 libavcodec/proresenc.c

1979bfe... by Andreas Cadhalpun

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

Signed-off-by: Michael Niedermayer <email address hidden>

2ddabbb... by Michael Niedermayer

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 <email address hidden>
Signed-off-by: Michael Niedermayer <email address hidden>
(cherry picked from commit 03f39fbb2a558153a3c464edec1378d637a755fe)

Signed-off-by: Michael Niedermayer <email address hidden>

2044699... by Michael Niedermayer

avformat/vqf: Use 64bit for ret to avoid overflow

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

Signed-off-by: Michael Niedermayer <email address hidden>