diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2015-04-20 22:43:31 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2015-04-20 22:46:46 +0200 |
commit | e6831c087e49157b64255388cc1bfdb60c76d79e (patch) | |
tree | 553d194a4ab1f422071ef0f79532151e1f180b37 /RELEASE | |
parent | a570e81234f769edd8b2d1c3b0aee1558b678f7d (diff) | |
parent | 338ed3ed33c412c2828446c4e2a76949161fec6a (diff) | |
download | ffmpeg-e6831c087e49157b64255388cc1bfdb60c76d79e.tar.gz |
Merge commit '338ed3ed33c412c2828446c4e2a76949161fec6a'
* commit '338ed3ed33c412c2828446c4e2a76949161fec6a':
ffv1: Pass correct pointers to av_free()
Conflicts:
libavcodec/ffv1.c
See: a3963cc8ec3b4e1780aadcbc0e5a7af625bae175
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'RELEASE')
0 files changed, 0 insertions, 0 deletions