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

Merge commit '73ed8558' 


* commit '73ed8558':
  avconv: simplify exit_program() by using more local vars

Conflicts:
	ffmpeg.c

Merged-by: default avatarMichael Niedermayer <michaelni@gmx.at>
parents db01de4c 73ed8558
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 38 additions and 29 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