ffmpeg/libavcodec/sh4
Michael Niedermayer c4e394e460 Merge commit '79dad2a932'
* commit '79dad2a932':
  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>
2013-02-07 13:09:35 +01:00
..
dsputil_align.c Merge commit '79dad2a932' 2013-02-07 13:09:35 +01:00
dsputil_sh4.c Merge commit '620289a20e' 2013-02-06 13:27:24 +01:00
dsputil_sh4.h Merge commit '88bd7fdc82' 2013-01-23 17:44:56 +01:00
h264chroma_init.c Merge commit '79dad2a932' 2013-02-07 13:09:35 +01:00
idct_sh4.c Merge commit '88bd7fdc82' 2013-01-23 17:44:56 +01:00
Makefile dsputil: Separate h264chroma 2013-02-06 11:30:53 +01:00
qpel.c Merge commit '79dad2a932' 2013-02-07 13:09:35 +01:00
sh4.h Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00