~oxide-developers/oxide/+git/ffmpeg:master

Branch merges

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related charm recipes

8e4b0b8... by Chris Coulson on 2017-04-15

Merge upstream 28a5cdde5c32bcf66715343c10f74e85713f7aaf in to master

28a5cdd... by Thomas Guilbert <email address hidden> on 2017-04-11

avformat/oggparseogm: Check available data before reading global header

Fixes use of uninitialized data

Found-by: Thomas Guilbert <email address hidden>
Signed-off-by: Michael Niedermayer <email address hidden>
(cherry picked from commit 170d864d2c508ca8111b1d108e1e964007dab712)

Bug:700673, 700690, 701754

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

afe7135... by Thomas Guilbert <email address hidden> on 2017-04-11

Cherry-pick upstream USAN fixes

avformat/mov: Check creation_time for overflow

Fixes integer overflow

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

---

avformat/oggparsedaala: Do not leave an invalid value in gpshift

Fixes: undefined behavior

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

---

avformat/oggparsedaala: Check duration for AV_NOPTS_VALUE

This avoids an integer overflow
the solution matches oggparsevorbis.c and
45581ed15d2ad5955e24d809820c1675da68f500

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

Bug: 701640, 700242, 702974
Change-Id: Ibcff00b7e137f2b07b062468ad42152dfd428a18
Reviewed-on: https://chromium-review.googlesource.com/475204
Reviewed-by: Matthew Wolenetz <email address hidden>

23a7be5... by Thomas Guilbert <email address hidden> on 2017-04-11

Fix dictionary leak in mp3dec

Upstream changes in mp3dec.c introduced a leak. s->metadata is
(correctly) assumed to be NULL when entering mp3_read_header,
but Chromium uses a custom dictionary entry to skip id3v1 tag
parsing, which requires an additional call to av_dict_free.

Bug:703965

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

f4ea518... by Chris Coulson on 2017-03-26

Merge upstream 9751ef06f90fb7ebf02b4e9ecc963a4e36a221d3 in to master

53f6b9d... by Chris Coulson on 2017-03-24

Merge upstream 6d2e444456b7694189165076ddfcccdf649147b2 in to master

9751ef0... by Dan Sanders <email address hidden> on 2017-03-23

Expose av_strerror() via ffmpeg.sigs.

Change-Id: I065daafb51970e75304c6d74ad32cc7eb9465bbd
Reviewed-on: https://chromium-review.googlesource.com/459076
Reviewed-by: Dale Curtis <email address hidden>
Reviewed-by: Matthew Wolenetz <email address hidden>

6d2e444... by Thomas Guilbert <email address hidden> on 2017-03-22

Add -Wno-unguarded-availability to fix Mac build

Due to the latest roll, building on OSX 10.12+ results in build
errors, such as "'clock_gettime' is only available on macOS 10.12 or
newer". Adding "-Wno-unguarded-availability" fixes the issue.

BUG=

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

51c6b0e... by Chris Coulson on 2017-03-22

Merge upstream b9acb5c51eea352657323b33737fee503e42604a in to master

b9acb5c... by Thomas Guilbert <email address hidden> on 2017-03-21

Merge branch 'mrg-m59'

BUG=698865