git.videolan.org
/
ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
0436ffc
f354f30
)
Merge commit 'f354f30836a3148275ce60d19bbc581310249ad2'
author
Michael Niedermayer
<michaelni@gmx.at>
Mon, 28 Oct 2013 11:26:31 +0000
(12:26 +0100)
committer
Michael Niedermayer
<michaelni@gmx.at>
Mon, 28 Oct 2013 11:26:31 +0000
(12:26 +0100)
* commit '
f354f30836a3148275ce60d19bbc581310249ad2
':
error resilience: check error_concealment, not err_recognition.
Conflicts:
libavcodec/error_resilience.c
See:
346e09638cc159a3c3e4cf971a5b795644faac16
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Trivial merge