diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-07-11 11:29:51 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-07-11 11:32:36 +0200 |
| commit | 2efc2b53be96efc7c647f13af00e48b53c249bdd (patch) | |
| tree | 01f65dd3c9dcb2369d04946f19215d7e2b8d3ead /presets/libvpx-360p.ffpreset | |
| parent | 56090b5b80431bfd791dbe8cfd23c058214118da (diff) | |
| parent | 7d65e960c72f36b73ae7fe84f8e427d758e61da9 (diff) | |
| download | ffmpeg-2efc2b53be96efc7c647f13af00e48b53c249bdd.tar.gz | |
Merge commit '7d65e960c72f36b73ae7fe84f8e427d758e61da9'
* commit '7d65e960c72f36b73ae7fe84f8e427d758e61da9':
iff: Do not read over the source buffer
Conflicts:
libavcodec/iff.c
See: 2fbb37b51bbea891392ad357baf8f3dff00bac05
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'presets/libvpx-360p.ffpreset')
0 files changed, 0 insertions, 0 deletions