Michael Niedermayer fc13a89654 Merge remote-tracking branch 'qatar/master' ...

* qatar/master:
  dsputil: Separate h264 qpel

Conflicts:
	libavcodec/dsputil_template.c
	libavcodec/h264.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>

2013-01-24 15:47:47 +01:00

..

dsputil_align.c

Merge remote-tracking branch 'qatar/master'

2013-01-24 15:47:47 +01:00

dsputil_sh4.c

Merge commit '88bd7fdc821aaa0cbcf44cf075c62aaa42121e3f'

2013-01-23 17:44:56 +01:00

dsputil_sh4.h

Merge commit '88bd7fdc821aaa0cbcf44cf075c62aaa42121e3f'

2013-01-23 17:44:56 +01:00

idct_sh4.c

Merge commit '88bd7fdc821aaa0cbcf44cf075c62aaa42121e3f'

2013-01-23 17:44:56 +01:00

Makefile

…

qpel.c

Merge remote-tracking branch 'qatar/master'

2013-01-24 15:47:47 +01:00

sh4.h

…