diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2014-04-21 14:34:02 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2014-04-21 14:34:02 +0200 |
commit | c9f17afe4e3c1fb57d089a8de5237851b0c0122b (patch) | |
tree | 98238e7d9e87655a1c8ac8f7f4105a4430f8b667 /libavutil/parseutils.c | |
parent | 6d33c8ec84904933878e341a8a4a30d3b944458f (diff) | |
parent | af40847681b978441fdd25276685414f9e17820a (diff) | |
download | ffmpeg-c9f17afe4e3c1fb57d089a8de5237851b0c0122b.tar.gz |
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>
Diffstat (limited to 'libavutil/parseutils.c')
0 files changed, 0 insertions, 0 deletions