diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-11-08 11:08:57 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-11-08 11:08:57 +0100 |
| commit | 4342b346d273366438f10a1cc665d0c2db2af469 (patch) | |
| tree | edf53510d6260436275026379cee2acfb750127e /libavcodec/resample2.c | |
| parent | 0bdc5db520ba9126776dd12b6734150ebcc7c559 (diff) | |
| parent | 8cb7b7b461b52898765b38e3eff68c0ce88347f3 (diff) | |
| download | ffmpeg-4342b346d273366438f10a1cc665d0c2db2af469.tar.gz | |
Merge commit '8cb7b7b461b52898765b38e3eff68c0ce88347f3'
* commit '8cb7b7b461b52898765b38e3eff68c0ce88347f3':
movenc: Avoid leaking locally allocated data when returning on errors
Conflicts:
libavformat/movenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/resample2.c')
0 files changed, 0 insertions, 0 deletions