diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-10-28 12:26:31 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-10-28 12:26:31 +0100 |
| commit | 528f5cdd2cf1c54f3f1b983964993c698ff91aca (patch) | |
| tree | f193551705667193aad8c94cec54cb2b0137ce6e /libavcodec/alsdec.c | |
| parent | 0436ffc294bab3038268db9f6ad32b3a35fcdc65 (diff) | |
| parent | f354f30836a3148275ce60d19bbc581310249ad2 (diff) | |
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>
Diffstat (limited to 'libavcodec/alsdec.c')
0 files changed, 0 insertions, 0 deletions