Merge commit '5bf2454e7cb03609b3ec1a3cf4c22427fe5f8e36'
authorClément Bœsch <u@pkh.me>
Wed, 22 Mar 2017 14:49:13 +0000 (15:49 +0100)
committerClément Bœsch <u@pkh.me>
Wed, 22 Mar 2017 14:49:13 +0000 (15:49 +0100)
commit17f2c0abea87df16edd2a6170a1d3ece23b2e465
treefacfa46c81f80634f0538304f8e5b86be4b05d20
parent0dbfed08d06a0d8f6da1bc0ff5ef06bf11e51302
parent5bf2454e7cb03609b3ec1a3cf4c22427fe5f8e36
Merge commit '5bf2454e7cb03609b3ec1a3cf4c22427fe5f8e36'

* commit '5bf2454e7cb03609b3ec1a3cf4c22427fe5f8e36':
  h264dec: support broken files with mp4 extradata/annex b data

This commit is a noop, see 93b89868e139e9b45dfc8a62b4f8e1832bbfd5d8

The sample pointed out on
https://github.com/HandBrake/HandBrake/issues/339 decodes fine in
FFmpeg.

Merged-by: Clément Bœsch <u@pkh.me>