* commit 'ff953fec':
  lavc: set frame properties in ff_get_buffer().

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