diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-08 14:45:18 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-08 14:54:53 +0200 |
| commit | 02018a359e05ebca8ded672166b80dad47ab2de1 (patch) | |
| tree | 5647522e2068d611532878570fd554e3aab926f8 /libavformat/utils.c | |
| parent | 451bc8ee2fceaf9a3290ed5a6c65b6734ab51b8c (diff) | |
| parent | 146b187113e3cc20c2a97c5f264da13e701ca247 (diff) | |
| download | ffmpeg-02018a359e05ebca8ded672166b80dad47ab2de1.tar.gz | |
Merge commit '146b187113e3cc20c2a97c5f264da13e701ca247' into release/1.1
* commit '146b187113e3cc20c2a97c5f264da13e701ca247':
lavc: Check the image size before calling get_buffer
Conflicts:
libavcodec/utils.c
See: 668494acd8b20f974c7722895d4a6a14c1005f1e
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/utils.c')
0 files changed, 0 insertions, 0 deletions