aboutsummaryrefslogtreecommitdiffstats
path: root/libavfilter/af_channelmap.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-04-11 11:53:19 +0200
committerMichael Niedermayer <michaelni@gmx.at>2013-04-11 11:53:19 +0200
commit0724b4a16d6b88b311610e96c7ba341a4b33965d (patch)
tree4e80fea21e5c1dd58bb706cecb95283f81e8846f /libavfilter/af_channelmap.c
parent944ad46182483ff52573ec3c827c86058b225d16 (diff)
parent62844c3fd66940c7747e9b2bb7804e265319f43f (diff)
downloadffmpeg-0724b4a16d6b88b311610e96c7ba341a4b33965d.tar.gz
Merge commit '62844c3fd66940c7747e9b2bb7804e265319f43f'
* commit '62844c3fd66940c7747e9b2bb7804e265319f43f': h264: Integrate clear_blocks calls with IDCT Conflicts: libavcodec/arm/h264idct_neon.S libavcodec/h264idct_template.c libavcodec/x86/h264_idct.asm Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/af_channelmap.c')
0 files changed, 0 insertions, 0 deletions