Merge commit '79dad2a932534d1155079f937649e099f9e5cc27'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 7 Feb 2013 12:09:35 +0000 (13:09 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 7 Feb 2013 12:09:35 +0000 (13:09 +0100)
commitc4e394e46008c9e208f666d156f49f7ba500d73a
tree4c70acf89ede1f9d24ec3056bb2d586f98a12bcd
parentb5884db437eebe136efef63a8186b7b4b51b5525
parent79dad2a932534d1155079f937649e099f9e5cc27
Merge commit '79dad2a932534d1155079f937649e099f9e5cc27'

* commit '79dad2a932534d1155079f937649e099f9e5cc27':
  dsputil: Separate h264chroma

Conflicts:
libavcodec/dsputil_template.c
libavcodec/ppc/dsputil_ppc.c
libavcodec/vc1dec.c
libavcodec/vc1dsp.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
38 files changed:
configure
libavcodec/Makefile
libavcodec/arm/dsputil_init_neon.c
libavcodec/arm/h264chroma_init_arm.c
libavcodec/cavs.c
libavcodec/cavs.h
libavcodec/dsputil.c
libavcodec/dsputil.h
libavcodec/dsputil_template.c
libavcodec/h264.c
libavcodec/h264.h
libavcodec/h264_mb_template.c
libavcodec/h264chroma.c
libavcodec/h264chroma.h
libavcodec/h264chroma_template.c
libavcodec/mpegvideo.c
libavcodec/mpegvideo.h
libavcodec/ppc/dsputil_altivec.h
libavcodec/ppc/dsputil_ppc.c
libavcodec/ppc/h264_qpel.c
libavcodec/ppc/h264_qpel_template.c
libavcodec/ppc/h264chroma_init.c
libavcodec/ppc/h264chroma_template.c
libavcodec/ppc/vc1dsp_altivec.c
libavcodec/rv30dsp.c
libavcodec/sh4/dsputil_align.c
libavcodec/sh4/h264chroma_init.c
libavcodec/sh4/qpel.c
libavcodec/vc1.h
libavcodec/vc1dec.c
libavcodec/vc1dsp.c
libavcodec/vc1dsp.h
libavcodec/vp56.c
libavcodec/vp56.h
libavcodec/vp6.c
libavcodec/x86/Makefile
libavcodec/x86/dsputil_mmx.c
libavcodec/x86/h264chroma_init.c