diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-18 13:10:57 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-18 13:10:57 +0200 |
| commit | fb8dde37e4b0d7966194bc614a1040eee902c4e1 (patch) | |
| tree | d0934d26819c7ee16521f5b63d103701316bace1 /libswresample | |
| parent | dd2eaf57b76033bf5e8d49457088dec60ad3e9a4 (diff) | |
| parent | d79bd6040599ef017dc45d5997fcc959ab1f71f6 (diff) | |
| download | ffmpeg-fb8dde37e4b0d7966194bc614a1040eee902c4e1.tar.gz | |
Merge commit 'd79bd6040599ef017dc45d5997fcc959ab1f71f6'
* commit 'd79bd6040599ef017dc45d5997fcc959ab1f71f6':
lavfi: factorize freeing a link
Conflicts:
libavfilter/avfilter.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswresample')
0 files changed, 0 insertions, 0 deletions