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

[Michael Niedermayer]

ffmpeg | branch: release/1.1 | Michael Niedermayer <michaelni at gmx.at> | Mon Apr 21 14:34:02 2014 +0200| [c9f17afe4e3c1fb57d089a8de5237851b0c0122b] | committer: Michael Niedermayer

Merge commit 'af40847681b978441fdd25276685414f9e17820a' into release/1.1

* commit 'af40847681b978441fdd25276685414f9e17820a':
  h264: check buffer size before accessing it

Conflicts:
	libavcodec/h264.c

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

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