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

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