Michael Niedermayer 5c17377e28 Merge commit 'd74a8cb7e42f703be5796eeb485f06af710ae8ca'
* commit 'd74a8cb7e42f703be5796eeb485f06af710ae8ca':
  fmtconvert: drop unused functions

Conflicts:
	libavcodec/arm/fmtconvert_vfp_armv6.S
	libavcodec/x86/fmtconvert.asm
	libavcodec/x86/fmtconvert_init.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-28 23:58:29 +01:00
..
2015-02-06 23:35:02 +01:00
2014-12-03 23:03:13 +01:00
2015-02-06 23:35:02 +01:00
2015-01-25 18:20:43 -03:00
2014-12-15 02:34:05 +01:00