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

Merge commit '67f2a688' 


* commit '67f2a688':
  avconv: remove a write-only variable

Conflicts:
	ffmpeg.c
	ffmpeg.h

Merged-by: default avatarMichael Niedermayer <michaelni@gmx.at>
parents e66247e9 67f2a688
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
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