[FFmpeg-cvslog] Merge commit '964fef3f3ced60e67831549df223bc177e1537c9' into release/2.2

[Michael Niedermayer]

ffmpeg | branch: release/2.2 | Michael Niedermayer <michaelni at gmx.at> | Mon Jun  1 13:55:46 2015 +0200| [443b9a7d0803e85728801f2275f94e2ec99334cf] | committer: Michael Niedermayer

Merge commit '964fef3f3ced60e67831549df223bc177e1537c9' into release/2.2

* commit '964fef3f3ced60e67831549df223bc177e1537c9':
  h264: Make sure reinit failures mark the context as not initialized

See: e8714f6f93d1a32f4e4655209960afcf4c185214
Merged-by: Michael Niedermayer <michaelni at gmx.at>

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