MPV

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

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

Branch merges

Branch information

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

Recent commits

a3fd812... by Luca Barbato <email address hidden>

librtmp: Avoid an infiniloop setting connection arguments

The exit condition was missing.

Signed-off-by: Timothy Gu <email address hidden>
(cherry picked from commit e85d38c20a8893cb59d7c86f74481f2497882196)
Signed-off-by: Timothy Gu <email address hidden>

ebd4d71... by James Almer <email address hidden>

avformat/oggparsevp8: fix pts calculation on pages ending with an invisible frame

Signed-off-by: James Almer <email address hidden>
(cherry picked from commit 5adfbd391847fcdaea1e9b105fae2dd90af2a733)

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

Changelog: update for the last 2 commits

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

342b6d3... by Michael Niedermayer <email address hidden>

avcodec/mjpegdec: Do not try to detect last scan but apply idct after all scans for progressive jpeg

Fixes: IMG-20160418-WA0002.jpg

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

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

74b8c4a... by Michael Niedermayer <email address hidden>

avformat/options_table: Add missing identifier for very strict compliance

Fixes Ticket5443

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

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

2ea09e5... by Michael Niedermayer <email address hidden>

Update for 2.6.9

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

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

avformat/ffmdec: Check pix_fmt

Fixes crash
Fixes Ticket5412

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

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

72d8ce1... by Michael Niedermayer <email address hidden>

avcodec/ttaenc: Reallocate packet if its too small

Fixes assertion failure
Fixes Ticket5394

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

Conflicts:

 libavcodec/ttaenc.c

19fcdd0... by Jan Ekström

pgssubdec: fix subpicture output colorspace and range

Functionality used before didn't widen the values from limited to
full range. Additionally, now the decoder uses BT.709 where it
should be used according to the video resolution.

Default for not yet set colorimetry is BT.709 due to most observed
HDMV content being HD.

BT.709 coefficients were gathered from the first two parts of BT.709
to BT.2020 conversion guide in ARIB STD-B62 (Pt. 1, Chapter 6.2.2).
They were additionally confirmed by manually calculating values.

Fixes #4637
(cherry picked from commit 9779b6262471d553c1ed811ff7312564e39d8adf)

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

542cc06... by Michael Niedermayer <email address hidden>

avcodec/ac3dec: Reset SPX when switching from EAC3 to AC3

Fixes Ticket5319

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

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