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

[Michael Niedermayer]

ffmpeg | branch: release/1.1 | Michael Niedermayer <michaelni at gmx.at> | Mon Apr 21 14:39:42 2014 +0200| [7434225ed15d7326cf9d906a7cd3539eb8184e8e] | committer: Michael Niedermayer

Merge commit '30e58e65e543d04d5e52bf188b31abf4dd41a104' into release/1.1

* commit '30e58e65e543d04d5e52bf188b31abf4dd41a104':
  h264_refs: make sure not to write over the bounds of the default ref list

Conflicts:
	libavcodec/h264_refs.c

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

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