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
..
2013-01-22 18:32:56 -08:00
2013-01-24 10:44:43 +01:00
2013-01-22 18:32:56 -08:00
2012-12-22 00:58:08 +01:00
2012-12-22 00:58:08 +01:00
2013-01-22 18:32:56 -08:00
2013-01-22 18:32:56 -08:00
2013-01-22 18:32:56 -08:00