Merge commit '636ced8e1dc8248a1353b416240b93d70ad03edb'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 8 Jul 2013 02:34:11 +0000 (04:34 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 8 Jul 2013 02:34:11 +0000 (04:34 +0200)
commitf982d006bb9e5ffb6bc032e62b5f34177a83df85
treed0c88573dd27d0633675955165a64b036cc10974
parent4cd066b69c08cd91aa4b5e40deb4b2f5c7e651ee
parent636ced8e1dc8248a1353b416240b93d70ad03edb
Merge commit '636ced8e1dc8248a1353b416240b93d70ad03edb'

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

Conflicts:
avprobe.c
cmdutils.c
ffmpeg.c

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