Michael Niedermayer 558784f113 Merge commit 'b9589f5a770ec2357ab7920a5fabe8510b8601f9' ...

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

Conflicts:
	libavcodec/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>

2013-10-30 10:23:24 +01:00

112 KiB

Raw Blame History

View Raw