Skip to content
Snippets Groups Projects
Commit a5f409bc authored by Michael Niedermayer's avatar Michael Niedermayer
Browse files

Merge commit '9a5e4fbe' 


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

Conflicts:
	ffmpeg.c

Merged-by: default avatarMichael Niedermayer <michaelni@gmx.at>
parents a50b0082 9a5e4fbe
No related branches found
No related tags found
Hide whitespace changes
Inline Side-by-side
Showing
with 8 additions and 9 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment