aboutsummaryrefslogtreecommitdiffstats
path: root/libavresample/audio_mix.h
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-04-12 15:01:41 +0200
committerMichael Niedermayer <michaelni@gmx.at>2013-04-12 15:08:40 +0200
commit835cc0f2e7098fbb548d7622110c4fdc0831809d (patch)
tree22408566623b068dd3eb0ab2a49751fb1ecde67d /libavresample/audio_mix.h
parentf4db6bfeb86feda2aeb98072e55b55de85ba0962 (diff)
parentfa2a34cd40d124161c748bb0f430dc63c94dd0da (diff)
downloadffmpeg-835cc0f2e7098fbb548d7622110c4fdc0831809d.tar.gz
Merge commit 'fa2a34cd40d124161c748bb0f430dc63c94dd0da'
* commit 'fa2a34cd40d124161c748bb0f430dc63c94dd0da': lavfi: change the filter registering system to match the other libraries Conflicts: cmdutils.c ffplay.c libavfilter/avfilter.c libavfilter/avfilter.h This removes the ability to put AVFilters in read only memory and having them shareable. Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavresample/audio_mix.h')
0 files changed, 0 insertions, 0 deletions