Michael Niedermayer 1e7a92f219 Merge commit 'baf35bb4bc4fe7a2a4113c50989d11dd9ef81e76'
* commit 'baf35bb4bc4fe7a2a4113c50989d11dd9ef81e76':
  dsputil: remove one array dimension from avg_no_rnd_pixels_tab.

Conflicts:
	libavcodec/x86/dsputil_mmx.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-23 18:15:29 +01:00
..
2012-05-05 22:04:21 +01:00
2013-01-22 18:32:56 -08: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