aboutsummaryrefslogtreecommitdiffstats
path: root/libavfilter/af_amix.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-08-10 10:36:18 +0200
committerMichael Niedermayer <michaelni@gmx.at>2013-08-10 10:37:20 +0200
commitef13a005c41c353b03b29edf7a20d226747dac4e (patch)
treedb2ab0666a1a38a397fa056c8f0a825e1d75f29c /libavfilter/af_amix.c
parente3a296dfa53ba78360d7f2c8c931db3490b06d5b (diff)
parenta76d0cdf21c3d9e464623cc0ad1c005abf952afa (diff)
downloadffmpeg-ef13a005c41c353b03b29edf7a20d226747dac4e.tar.gz
Merge commit 'a76d0cdf21c3d9e464623cc0ad1c005abf952afa'
* commit 'a76d0cdf21c3d9e464623cc0ad1c005abf952afa': libavutil: Move avpriv_open to a new file, file_open.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/af_amix.c')
0 files changed, 0 insertions, 0 deletions