* commit 'b9589f5a':
  lavc: add error checking to apply_param_change.

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