Merge commit 'f354f30836a3148275ce60d19bbc581310249ad2'

* commit 'f354f30836a3148275ce60d19bbc581310249ad2':
  error resilience: check error_concealment, not err_recognition.

Conflicts:
	libavcodec/error_resilience.c

See: 346e09638c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-10-28 12:26:31 +01:00
commit 528f5cdd2c

Diff Content Not Available