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

Merge commit 'c92965db' 


* commit 'c92965db':
  avconv: check return value

Conflicts:
	ffmpeg.c

See: 4930cd13
Merged-by: default avatarMichael Niedermayer <michaelni@gmx.at>
parents 1dd38e99 c92965db
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 3 additions and 2 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