* commit 'd351ef47':
  pthread_frame: use the AVFrame API properly.

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