diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-06-29 12:03:59 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-06-29 12:23:56 +0200 |
| commit | a3e9f4c32a92f317ccbf038036f8aa12d2467428 (patch) | |
| tree | f8e6eeea30634ca4468bc28fa314838510f12f0c /libavcodec/pnmenc.c | |
| parent | 562e8d019ba2205a31cf78808e9c4d633bd158be (diff) | |
| parent | 38229362529ed1619d8ebcc81ecde85b23b45895 (diff) | |
| download | ffmpeg-a3e9f4c32a92f317ccbf038036f8aa12d2467428.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
wmapro: check num_vec_coeffs against the actual available buffer
Conflicts:
libavcodec/wmaprodec.c
The check is replaced by an assert.
See: b21ba20cc83c80fe56192fee3626a8087f37d806
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/pnmenc.c')
0 files changed, 0 insertions, 0 deletions