Merge commit 'c79cf0129edafc388ba1c47cd7b6a620557e48de' into release/0.10
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 12 Aug 2014 16:58:04 +0000 (18:58 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 12 Aug 2014 16:58:09 +0000 (18:58 +0200)
* commit 'c79cf0129edafc388ba1c47cd7b6a620557e48de':
  error_concealment: avoid using the picture if not fully setup

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavcodec/error_resilience.c

Simple merge