aboutsummaryrefslogtreecommitdiffstats
path: root/libavfilter/af_amix.c
diff options
context:
space:
mode:
authorHendrik Leppkes <h.leppkes@gmail.com>2015-10-27 14:06:30 +0100
committerHendrik Leppkes <h.leppkes@gmail.com>2015-10-27 14:06:30 +0100
commitfe41f28c3a430722dd95ef8e73bed8c7f070f51d (patch)
tree6d0506ff87b94f584978cc62d551faab03674836 /libavfilter/af_amix.c
parent564eabeebb1e4239d0ff19a5a93ff9757ebbec70 (diff)
parentfe66671bd5f446f8d0a9c70968ba8fe891efe028 (diff)
downloadffmpeg-fe41f28c3a430722dd95ef8e73bed8c7f070f51d.tar.gz
Merge commit 'fe66671bd5f446f8d0a9c70968ba8fe891efe028'
* commit 'fe66671bd5f446f8d0a9c70968ba8fe891efe028': cmdutils: Check for and report the correct codec capability Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Diffstat (limited to 'libavfilter/af_amix.c')
0 files changed, 0 insertions, 0 deletions