Merge commit 'f354f30836a3148275ce60d19bbc581310249ad2'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 28 Oct 2013 11:26:31 +0000 (12:26 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 28 Oct 2013 11:26:31 +0000 (12:26 +0100)
commit528f5cdd2cf1c54f3f1b983964993c698ff91aca
treef193551705667193aad8c94cec54cb2b0137ce6e
parent0436ffc294bab3038268db9f6ad32b3a35fcdc65
parentf354f30836a3148275ce60d19bbc581310249ad2
Merge commit 'f354f30836a3148275ce60d19bbc581310249ad2'

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

Conflicts:
libavcodec/error_resilience.c

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