[FFmpeg-cvslog] Merge commit 'f354f30836a3148275ce60d19bbc581310249ad2'
Michael Niedermayer
git at videolan.org
Mon Oct 28 12:27:51 CET 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Oct 28 12:26:31 2013 +0100| [528f5cdd2cf1c54f3f1b983964993c698ff91aca] | committer: Michael Niedermayer
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 at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=528f5cdd2cf1c54f3f1b983964993c698ff91aca
---
More information about the ffmpeg-cvslog
mailing list