diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-06-21 10:41:41 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-06-21 10:41:41 +0200 |
| commit | 5d509fbdcf6277716414702dc961d33c8e1eedcb (patch) | |
| tree | 4d6c38c91afdff1eaae29a1aafa7faa9a3647cf6 /libavutil/aes.c | |
| parent | 8cdea50f6eee1271e24ff0c9590522f8323e87fe (diff) | |
| parent | eeeb5c291d3f78eaade5b99c2614c7cab0e9be79 (diff) | |
| download | ffmpeg-5d509fbdcf6277716414702dc961d33c8e1eedcb.tar.gz | |
Merge commit 'eeeb5c291d3f78eaade5b99c2614c7cab0e9be79'
* commit 'eeeb5c291d3f78eaade5b99c2614c7cab0e9be79':
vsrc_movie: do not free avoption variables in uninit()
Conflicts:
libavfilter/src_movie.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/aes.c')
0 files changed, 0 insertions, 0 deletions