[FFmpeg-cvslog] Merge commit '3b69f245dbe6e2016659a45c4bfe284f6c5ac57e' into release/2.4

[Michael Niedermayer]

ffmpeg | branch: release/2.4 | Michael Niedermayer <michaelni at gmx.at> | Sun May 31 00:13:22 2015 +0200| [b50fa26885dc0c22dcb2f184d4d94da787b2d8a8] | committer: Michael Niedermayer

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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b50fa26885dc0c22dcb2f184d4d94da787b2d8a8
---