Merge commit '94603feb1b3ad01a821a1a1cef1570b13f471821'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 28 Oct 2013 10:01:11 +0000 (11:01 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 28 Oct 2013 10:08:58 +0000 (11:08 +0100)
commitac3fa95e73e52179c52cb0f117c06cdbaced6893
treea7bc3c3a1e740306c9090445b04c34f84a36400c
parentbdd3a746775f17f315b411105cb85f639cf036d1
parent94603feb1b3ad01a821a1a1cef1570b13f471821
Merge commit '94603feb1b3ad01a821a1a1cef1570b13f471821'

* commit '94603feb1b3ad01a821a1a1cef1570b13f471821':
  h264_ps: when parsing a VUI fails, only abort when explode is set

Merge only for metadata, ignoring invalid data can put the context
into an invalid state and can possibly be used for remote code
execution exploits.
Also we support all non standard VUIs that have been reported so
ignoring parsing failure makes no sense for us unless theres
some issue that has not been reported

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/h264_ps.c