diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-11-18 03:08:20 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-11-18 03:08:20 +0100 |
| commit | 8426edef4cf521104bb9288ac46a48dc4bdaee53 (patch) | |
| tree | 51a07cc48e411611ac25cd7e79f4850042a3cba5 /libavcodec/msmpeg4data.c | |
| parent | 7384ec19cf13fe204317c1b88333c58cbfa6336a (diff) | |
| parent | 771656bd85416cd6308b11aed6f2c69a8db9c21b (diff) | |
| download | ffmpeg-8426edef4cf521104bb9288ac46a48dc4bdaee53.tar.gz | |
Merge commit '771656bd85416cd6308b11aed6f2c69a8db9c21b'
* commit '771656bd85416cd6308b11aed6f2c69a8db9c21b':
libvpxenc: clean memory on error
Conflicts:
libavcodec/libvpxenc.c
See: 104b1d9e103f90485e894b20dd5bb3f1964fe5f3
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/msmpeg4data.c')
0 files changed, 0 insertions, 0 deletions