diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-29 14:33:10 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-29 14:33:39 +0100 |
| commit | d840266633c6c56e5abe42cfda997f22678fe7b1 (patch) | |
| tree | 2e0f5bd2b607a430bdc18c0e52136e5a9c437613 | |
| parent | 46f72ea507afee6adb0d2324848159063d0e7afc (diff) | |
| parent | 85698be461c07be10d873dd34348bcfe9ffc56e0 (diff) | |
| download | ffmpeg-d840266633c6c56e5abe42cfda997f22678fe7b1.tar.gz | |
Merge commit '85698be461c07be10d873dd34348bcfe9ffc56e0'
* commit '85698be461c07be10d873dd34348bcfe9ffc56e0':
cmdutils: Mark exit_program as av_noreturn
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | cmdutils.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cmdutils.h b/cmdutils.h index d1e1ecbe7e..2b9a825868 100644 --- a/cmdutils.h +++ b/cmdutils.h @@ -58,7 +58,7 @@ void register_exit(void (*cb)(int ret)); /** * Wraps exit with a program-specific cleanup routine. */ -void exit_program(int ret); +void exit_program(int ret) av_noreturn; /** * Initialize the cmdutils option system, in particular |