Merge commit 'af40847681b978441fdd25276685414f9e17820a' into release/1.1
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 21 Apr 2014 12:34:02 +0000 (14:34 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 21 Apr 2014 12:34:02 +0000 (14:34 +0200)
commitc9f17afe4e3c1fb57d089a8de5237851b0c0122b
tree98238e7d9e87655a1c8ac8f7f4105a4430f8b667
parent6d33c8ec84904933878e341a8a4a30d3b944458f
parentaf40847681b978441fdd25276685414f9e17820a
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@gmx.at>
libavcodec/h264.c