* commit 'dd2d3b76':
  lavc: Add hwaccel private data and init/uninit callbacks

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