third_party_ffmpeg/libavcodec/sh4
Michael Niedermayer a984efd104 Merge commit 'c242bbd8b6939507a1a6fb64101b0553d92d303f'
* commit 'c242bbd8b6939507a1a6fb64101b0553d92d303f':
  Remove unnecessary dsputil.h #includes

Conflicts:
	libavcodec/ffv1.c
	libavcodec/h261dec.c
	libavcodec/h261enc.c
	libavcodec/h264pred.c
	libavcodec/lpc.h
	libavcodec/mjpegdec.c
	libavcodec/rectangle.h
	libavcodec/x86/idct_sse2_xvid.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-26 13:05:10 +01:00
..
dsputil_align.c Merge commit 'bf6b3ec924b4fb64d14df33077f4d4541d525dbf' 2013-02-09 14:22:05 +01:00
dsputil_sh4.c Merge commit '620289a20e022b9c16c10d546ef86cc0bb77cc84' 2013-02-06 13:27:24 +01:00
dsputil_sh4.h Merge commit '88bd7fdc821aaa0cbcf44cf075c62aaa42121e3f' 2013-01-23 17:44:56 +01:00
h264chroma_init.c Merge commit '79dad2a932534d1155079f937649e099f9e5cc27' 2013-02-07 13:09:35 +01:00
idct_sh4.c Merge commit 'c242bbd8b6939507a1a6fb64101b0553d92d303f' 2013-02-26 13:05:10 +01:00
Makefile dsputil: Separate h264chroma 2013-02-06 11:30:53 +01:00
qpel.c Merge commit 'bf6b3ec924b4fb64d14df33077f4d4541d525dbf' 2013-02-09 14:22:05 +01:00
sh4.h