~oxide-developers/oxide/+git/ffmpeg:oxide/dev/cr2924

Last commit made on 2016-12-07
Get this branch:
git clone -b oxide/dev/cr2924 https://git.launchpad.net/~oxide-developers/oxide/+git/ffmpeg
Members of Oxide Developers can upload to this branch. Log in for directions.

Branch merges

Branch information

Name:
oxide/dev/cr2924
Repository:
lp:~oxide-developers/oxide/+git/ffmpeg

Recent commits

448748e... by Chris Coulson

Merge upstream 7e5307d753a5a21f6d02663ccccf2acdf7aeae0e in to oxide/dev/cr2924

7e5307d... by "<email address hidden>" <email address hidden>

Consume headers in flac parser.

Fix from Michael Neidermayer. Prevents clusterfuzz test case from
looping forever trying to find the next header.

BUG=665305
Change-Id: If518327c93569c475bdabec154ac5c4499b74acd
Reviewed-on: https://chromium-review.googlesource.com/414310
Reviewed-by: Dale Curtis <email address hidden>

d16162e... by Matt Wolenetz <email address hidden>

mov: immediately return from mov_fix_index without old index entries

If there are no index entries, e_old = st->index_entries is only one
byte large, since it was created by av_realloc called with size 0.

Thus accessing e_old[0].timestamp causes a heap buffer overflow.

Reviewed-by: Sasi Inguva <email address hidden>
Signed-off-by: Andreas Cadhalpun <email address hidden>
(cherry picked from commit 9d83b209d8861f1daf55f6719b1e0c226ed7269a)

<email address hidden>
BUG=667063

Change-Id: I1dbc7dae4ea8d4869ecc35a8657b9aade98a5d48
Reviewed-on: https://chromium-review.googlesource.com/413549
Reviewed-by: Dale Curtis <email address hidden>

5ed6e20... by Chris Cunningham <email address hidden>

mp3dec: fix msan warning when verifying mpa header

MPEG Audio frame header must be 4 bytes. If we fail to read
4 bytes bail early to avoid Use-of-uninitialized-value msan error.

BUG=666874
TEST=libfuzzer_media_pipeline_integration_fuzzer

Change-Id: I3a3fdeb1dbd8c8b2f1f81d621bbbafab9b77bb34
Reviewed-on: https://chromium-review.googlesource.com/413605
Reviewed-by: Matthew Wolenetz <email address hidden>

141e56c... by Matt Wolenetz <email address hidden>

lavc/libopusdec.c Fix ff_vorbis_channel_layouts OOB

Similar to existing lavc/vorbisdec.c code which first checks that
avc->channels is valid for accessing ff_vorbis_channel_layouts, this
change adds protection to libopusdec.c to prevent accessing that
array with a negative index.

<email address hidden>
BUG=666794

Change-Id: Id301bd783cb9b826117d41b20b1b05f28d35827c
Reviewed-on: https://chromium-review.googlesource.com/413334
Reviewed-by: Dale Curtis <email address hidden>

e91355a... by Matt Wolenetz <email address hidden>

lavf/utils.c Protect against accessing entries[nb_entries]

In ff_index_search_timestamp(), if b == num_entries,
m == num_entries - 1, and entries[m].flags & AVINDEX_DISCARD_FRAME is
true, then the search for the next non-discarded packet could access
entries[nb_entries], exceeding its bounds. This change adds a protection
against that scenario.

BUG=666770,666769
<email address hidden>

Change-Id: Ib9a84dae74dad1e70a7a0afcf3382fd187152733
Reviewed-on: https://chromium-review.googlesource.com/413306
Reviewed-by: Dale Curtis <email address hidden>

92f86a5... by Matt Wolenetz <email address hidden>

Disable deprecation warnings locally within ffmpeg

Upstream changes in the FFmpeg M56 roll included some deprecated usages
of avcodec_encode_{audio,video}2() and AVStream.codec internally in
lavc/utils.c and lavf/utils.c, respectively. This change locally
disables deprecation warnings around those usages to prevent spamming
such warnings when building Chrom*.

BUG=591845
<email address hidden>

Change-Id: I2086156c22114cccffa355d47336aa31fa5bb135
Reviewed-on: https://chromium-review.googlesource.com/412444
Reviewed-by: Dale Curtis <email address hidden>

cdf4acc... by Matt Wolenetz <email address hidden>

Merge branch 'merge-m56'

BUG=591845,264459,93887,590401,604451,590440,661350

5d76f94... by Matt Wolenetz <email address hidden>

Enable windows Chrom* build including lavf/wavdec.c

Expands the downstream #if's to exclude more code blocks including
symbols not in our builds, gated by each of CONFIG_SPDIF_DEMUXER and
CONFIG_W64_DEMUXER. At least the windows toolchain otherwise would fail
linking Chrom* pieces due to resolved symbols without this change.

BUG=264459

Change-Id: I554740ec871f5cf70294bbd762deb464e484b241
Reviewed-on: https://chromium-review.googlesource.com/412440
Reviewed-by: Dale Curtis <email address hidden>

d0e183d... by Matt Wolenetz <email address hidden>

Updating build configs for M56 roll.

BUG=591845

Change-Id: Ic63be7e9243aeff1f8c758c1c428717c9f12d966
Reviewed-on: https://chromium-review.googlesource.com/411990
Reviewed-by: Dale Curtis <email address hidden>