Merge commit '6906b19346ae8a330bfaa1c16ce535be10789723'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 21 Dec 2012 16:18:43 +0000 (17:18 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 21 Dec 2012 16:18:43 +0000 (17:18 +0100)
commita41bf09d9c56215448f14fb086c9f882eb41ecac
tree541da01619d95763ff0ee46ae0df50125505b3c4
parentfb3f28ee289b9ea5106d5a7fa00a1018eb379e65
parent6906b19346ae8a330bfaa1c16ce535be10789723
Merge commit '6906b19346ae8a330bfaa1c16ce535be10789723'

* commit '6906b19346ae8a330bfaa1c16ce535be10789723':
  lavc: add missing files for arm
  lavc: introduce VideoDSPContext

Conflicts:
configure
libavcodec/arm/dsputil_init_armv5te.c
libavcodec/dsputil.c
libavcodec/dsputil.h
libavcodec/dsputil_template.c
libavcodec/h264.c
libavcodec/mpegvideo.h
libavcodec/mpegvideo_enc.c
libavcodec/x86/dsputil_mmx.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
33 files changed:
configure
libavcodec/Makefile
libavcodec/arm/dsputil_arm.S
libavcodec/arm/dsputil_init_armv5te.c
libavcodec/arm/videodsp_init_armv5te.c
libavcodec/cavs.c
libavcodec/dsputil.c
libavcodec/dsputil.h
libavcodec/dsputil_template.c
libavcodec/h264.c
libavcodec/h264_mb_template.c
libavcodec/mpegvideo.c
libavcodec/mpegvideo.h
libavcodec/mpegvideo_enc.c
libavcodec/mpegvideo_motion.c
libavcodec/ppc/dsputil_ppc.c
libavcodec/rv34.c
libavcodec/snow.c
libavcodec/snow.h
libavcodec/svq3.c
libavcodec/vc1dec.c
libavcodec/videodsp.c
libavcodec/videodsp_template.c
libavcodec/vp3.c
libavcodec/vp56.c
libavcodec/vp56.h
libavcodec/vp8.c
libavcodec/vp8.h
libavcodec/wmv2.c
libavcodec/x86/Makefile
libavcodec/x86/dsputil.asm
libavcodec/x86/dsputil_mmx.c
libavcodec/x86/videodsp_init.c