diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-09-12 12:57:58 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-09-12 12:57:58 +0200 |
| commit | af539319af3a2c173e275fb927c7069e6b167114 (patch) | |
| tree | 5ca40632b1bb05f9ca59ac7eca08eec12946ae80 /presets/libvpx-720p.ffpreset | |
| parent | f8932d990228c53ee498b17eadf9dae4755c87ab (diff) | |
| parent | f3d57dc69145f1b7acb4870da9ce60378190a1fd (diff) | |
| download | ffmpeg-af539319af3a2c173e275fb927c7069e6b167114.tar.gz | |
Merge commit 'f3d57dc69145f1b7acb4870da9ce60378190a1fd'
* commit 'f3d57dc69145f1b7acb4870da9ce60378190a1fd':
smacker: Free memory properly if the init function fails
Conflicts:
libavcodec/smacker.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'presets/libvpx-720p.ffpreset')
0 files changed, 0 insertions, 0 deletions