[FFmpeg-cvslog] Merge commit '73ed8558a61c4f1d0ce8d1f35183ac1a0a4e31e3'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon May  5 14:39:13 2014 +0200| [6e397074380e64b177e51d5a9ed2a96e1a5b5f7a] | committer: Michael Niedermayer

Merge commit '73ed8558a61c4f1d0ce8d1f35183ac1a0a4e31e3'

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

Conflicts:
	ffmpeg.c

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

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6e397074380e64b177e51d5a9ed2a96e1a5b5f7a
---