* commit 'ad0c9f2d':
  lavc: move AVFrame.hwaccel_picture_private to Picture.

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