diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-05 19:41:10 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-05 19:43:25 +0100 |
commit | 31559723ab453ea12953c7f1d4024717dfff6c6e (patch) | |
tree | 734433ebb4e9884a2480d3d9435b3eaf9948105d /libavcodec/aacenc.c | |
parent | 8c013a9e55d9065793ef7ca6459d1178927a2b35 (diff) | |
parent | 66624ed6319cb1a959256fe1a717fec5b748fbfa (diff) | |
download | ffmpeg-31559723ab453ea12953c7f1d4024717dfff6c6e.tar.gz |
Merge commit '66624ed6319cb1a959256fe1a717fec5b748fbfa'
* commit '66624ed6319cb1a959256fe1a717fec5b748fbfa':
rv10: check size of s->mb_width * s->mb_height
Conflicts:
libavcodec/rv10enc.c
See: 2578a546183da09d49d5bba8ab5e982dece1dede
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/aacenc.c')
0 files changed, 0 insertions, 0 deletions