Merge commit '3b69f245dbe6e2016659a45c4bfe284f6c5ac57e' into release/2.4
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 30 May 2015 22:13:22 +0000 (00:13 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 30 May 2015 22:13:22 +0000 (00:13 +0200)
commitb50fa26885dc0c22dcb2f184d4d94da787b2d8a8
tree9ff886293d7a536bed3dda0138e370788464aae0
parent2c180cfc5dd549c90cbbb3b02e9c67ce6b55cbec
parent3b69f245dbe6e2016659a45c4bfe284f6c5ac57e
Merge commit '3b69f245dbe6e2016659a45c4bfe284f6c5ac57e' into release/2.4

* commit '3b69f245dbe6e2016659a45c4bfe284f6c5ac57e':
  h264: Make sure reinit failures mark the context as not initialized

Conflicts:
libavcodec/h264_slice.c

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