summaryrefslogtreecommitdiff
path: root/libavfilter/af_channelmap.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2015-07-23 11:43:49 +0200
committerMichael Niedermayer <michael@niedermayer.cc>2015-07-23 11:43:56 +0200
commit40e8ade9ebda8286a0291c575c874755670ce81f (patch)
tree8d0e0b22cbe9d04da4e590a8a0d07bc20af081f4 /libavfilter/af_channelmap.c
parentcd4c878934a632dba2fe75a78e843b0f729fc79f (diff)
parentaed7715b8fa295980c221f1cd095d42cd3bd74a6 (diff)
Merge commit 'aed7715b8fa295980c221f1cd095d42cd3bd74a6'
* commit 'aed7715b8fa295980c221f1cd095d42cd3bd74a6': asfdec: increment nb_streams right after the stream allocation Merged-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavfilter/af_channelmap.c')
0 files changed, 0 insertions, 0 deletions