[FFmpeg-cvslog] Merge commit '636ced8e1dc8248a1353b416240b93d70ad03edb'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Jul  8 04:34:11 2013 +0200| [f982d006bb9e5ffb6bc032e62b5f34177a83df85] | committer: Michael Niedermayer

Merge commit '636ced8e1dc8248a1353b416240b93d70ad03edb'

* commit '636ced8e1dc8248a1353b416240b93d70ad03edb':
  cmdutils: wrap exit explicitly

Conflicts:
	avprobe.c
	cmdutils.c
	ffmpeg.c

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

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