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)
commit6e397074380e64b177e51d5a9ed2a96e1a5b5f7a
treee82e3b0a5d368ea4c8112a242eb3ecded33d21e0
parentdb01de4c0af8d44c3b0008861b0a2b685a6b9186
parent73ed8558a61c4f1d0ce8d1f35183ac1a0a4e31e3
Merge commit '73ed8558a61c4f1d0ce8d1f35183ac1a0a4e31e3'

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

Conflicts:
ffmpeg.c

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