Merge commit '9a5e4fbec870c7d466b7a0aec92c70778efc96b5'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 27 Jun 2015 18:34:42 +0000 (20:34 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 27 Jun 2015 18:34:42 +0000 (20:34 +0200)
commita5f409bcc09176ad9443697d95da6a1edf3944aa
tree3fe98dafa3933f380be99cb5ef5428b456acd9f3
parenta50b00822784f6b098eb634132ad75394f1d26c0
parent9a5e4fbec870c7d466b7a0aec92c70778efc96b5
Merge commit '9a5e4fbec870c7d466b7a0aec92c70778efc96b5'

* commit '9a5e4fbec870c7d466b7a0aec92c70778efc96b5':
  avconv: do not stop processing the input packet on decoding error

Conflicts:
ffmpeg.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
ffmpeg.c