diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-12 18:58:04 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-12 18:58:09 +0200 |
commit | 688ab26604749539cfa5143bfc61a9d9f4d642aa (patch) | |
tree | ac05baf804e80f499ceea9a3f52135b320f708df /MAINTAINERS | |
parent | a2c6cb260fdab9337e9a2aca2c53e5bf136dc3e1 (diff) | |
parent | c79cf0129edafc388ba1c47cd7b6a620557e48de (diff) | |
download | ffmpeg-688ab26604749539cfa5143bfc61a9d9f4d642aa.tar.gz |
Merge commit 'c79cf0129edafc388ba1c47cd7b6a620557e48de' into release/0.10
* commit 'c79cf0129edafc388ba1c47cd7b6a620557e48de':
error_concealment: avoid using the picture if not fully setup
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'MAINTAINERS')
0 files changed, 0 insertions, 0 deletions