aboutsummaryrefslogtreecommitdiffstats
path: root/libavutil
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-06-23 13:23:41 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-06-23 13:31:26 +0200
commit35bb74900b951dccdc7481e98a00246f59ec2420 (patch)
tree4e1545a104d5d0eb3194d84f9df6318841c39675 /libavutil
parent56afbe8dbc6e508ba279bb95db542b940284fa7d (diff)
parentc67b449bebbe0b35c73b203683e77a0a649bc765 (diff)
downloadffmpeg-35bb74900b951dccdc7481e98a00246f59ec2420.tar.gz
Merge commit 'c67b449bebbe0b35c73b203683e77a0a649bc765'
* commit 'c67b449bebbe0b35c73b203683e77a0a649bc765': dsputil: Split bswap*_buf() off into a separate context Conflicts: configure libavcodec/4xm.c libavcodec/ac3dec.c libavcodec/ac3dec.h libavcodec/apedec.c libavcodec/eamad.c libavcodec/flacenc.c libavcodec/fraps.c libavcodec/huffyuv.c libavcodec/huffyuvdec.c libavcodec/motionpixels.c libavcodec/truemotion2.c libavcodec/x86/Makefile libavcodec/x86/dsputil_init.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil')
0 files changed, 0 insertions, 0 deletions