* qatar/master:
  hwaccel: fix use with frame based multithreading

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