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

32 KiB

Raw Blame History

View Raw