diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-12-06 14:06:53 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-12-06 14:07:08 +0100 |
commit | db44eff197be05b7423105567dac336f10e18941 (patch) | |
tree | 0caae75a49570df45a67e9b028f0b9d69a210e9b /libavcodec/proresdata.c | |
parent | 711c664a0e491a859d951f0d98807ec4327da283 (diff) | |
parent | f51e3a1971045c7ed0c3d9d29d3254a4d940198e (diff) | |
download | ffmpeg-db44eff197be05b7423105567dac336f10e18941.tar.gz |
Merge commit 'f51e3a1971045c7ed0c3d9d29d3254a4d940198e'
* commit 'f51e3a1971045c7ed0c3d9d29d3254a4d940198e':
webp: do not call av_frame_free() on the user-provided frame
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/proresdata.c')
0 files changed, 0 insertions, 0 deletions