[FFmpeg-cvslog] Merge commit '146b187113e3cc20c2a97c5f264da13e701ca247' into release/1.1

[Michael Niedermayer]

ffmpeg | branch: release/1.1 | Michael Niedermayer <michaelni at gmx.at> | Fri Aug  8 14:45:18 2014 +0200| [02018a359e05ebca8ded672166b80dad47ab2de1] | committer: Michael Niedermayer

Merge commit '146b187113e3cc20c2a97c5f264da13e701ca247' into release/1.1

* commit '146b187113e3cc20c2a97c5f264da13e701ca247':
  lavc: Check the image size before calling get_buffer

Conflicts:
	libavcodec/utils.c

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

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