[FFmpeg-cvslog] Merge commit '52254067b312e78d30bbe79fc33dbdf995b22b4e' into release/1.1

[Michael Niedermayer]

ffmpeg | branch: release/1.1 | Michael Niedermayer <michaelni at gmx.at> | Fri Aug  8 16:06:27 2014 +0200| [b65c290f7fecde65755cfb4ae1e452dcd0f07464] | committer: Michael Niedermayer

Merge commit '52254067b312e78d30bbe79fc33dbdf995b22b4e' into release/1.1

* commit '52254067b312e78d30bbe79fc33dbdf995b22b4e':
  error_concealment: avoid using the picture if not fully setup

Conflicts:
	libavcodec/error_resilience.c

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

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