* commit 'bd255f9f':
  lavc: set frame parameters after decoding only if necessary

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