aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/wma_common.h
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-06-19 04:41:48 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-06-19 04:54:38 +0200
commit2b05db4f8102148d013755ac2a7e47f6d79ff7ca (patch)
tree8135823ee5f9db622126672b644e06c243ae3c01 /libavcodec/wma_common.h
parentab12373956e92b865bced9b05b12971f062cfd3e (diff)
parente74433a8e6fc00c8dbde293c97a3e45384c2c1d9 (diff)
downloadffmpeg-2b05db4f8102148d013755ac2a7e47f6d79ff7ca.tar.gz
Merge commit 'e74433a8e6fc00c8dbde293c97a3e45384c2c1d9'
* commit 'e74433a8e6fc00c8dbde293c97a3e45384c2c1d9': dsputil: Split clear_block*/fill_block* off into a separate context Conflicts: configure libavcodec/asvdec.c libavcodec/dnxhddec.c libavcodec/dnxhdenc.c libavcodec/dsputil.h libavcodec/eamad.c libavcodec/intrax8.c libavcodec/mjpegdec.c libavcodec/ppc/dsputil_ppc.c libavcodec/vc1dec.c libavcodec/x86/dsputil_init.c libavcodec/x86/dsputil_mmx.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/wma_common.h')
0 files changed, 0 insertions, 0 deletions