* commit 'fb0c9d41':
  avutil: remove timer.h include from internal.h

Conflicts:
	libavcodec/ffv1dec.c
	libavutil/internal.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>