Michael Niedermayer f982d006bb Merge commit '636ced8e1dc8248a1353b416240b93d70ad03edb' ...

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

Conflicts:
	avprobe.c
	cmdutils.c
	ffmpeg.c

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

2013-07-08 04:34:11 +02:00

18 KiB

Raw Blame History

View Raw