Merge commit '30e58e65e543d04d5e52bf188b31abf4dd41a104' into release/1.1
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 21 Apr 2014 12:39:42 +0000 (14:39 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 21 Apr 2014 12:39:55 +0000 (14:39 +0200)
commit7434225ed15d7326cf9d906a7cd3539eb8184e8e
tree028363b61042619d7f3db2d08665a50dec6bc04c
parentc9f17afe4e3c1fb57d089a8de5237851b0c0122b
parent30e58e65e543d04d5e52bf188b31abf4dd41a104
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@gmx.at>
libavcodec/h264_refs.c