Merge commit '73ed8558a61c4f1d0ce8d1f35183ac1a0a4e31e3'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 5 May 2014 12:39:13 +0000 (14:39 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 5 May 2014 12:39:13 +0000 (14:39 +0200)
* commit '73ed8558a61c4f1d0ce8d1f35183ac1a0a4e31e3':
  avconv: simplify exit_program() by using more local vars

Conflicts:
ffmpeg.c

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

No differences found