aboutsummaryrefslogtreecommitdiffstats
path: root/avconv.c
diff options
context:
space:
mode:
authorAnton Khirnov <anton@khirnov.net>2011-08-29 07:03:24 +0200
committerAnton Khirnov <anton@khirnov.net>2011-09-04 13:12:00 +0200
commitdad09ff93f5df1ec987493f404d43cd16991e992 (patch)
treed69e680344af9464ab4f6f3e37b974ba9430bbd3 /avconv.c
parent346ea9e22240b4442f479518f6c3b40c9bec9487 (diff)
downloadffmpeg-dad09ff93f5df1ec987493f404d43cd16991e992.tar.gz
cmdutils: move exit_program() declaration to cmdutils from avconv
Allows cmdutils to call each tool's own cleanup function.
Diffstat (limited to 'avconv.c')
-rw-r--r--avconv.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/avconv.c b/avconv.c
index b2dce53fff..52a71085fa 100644
--- a/avconv.c
+++ b/avconv.c
@@ -433,7 +433,7 @@ static int decode_interrupt_cb(void)
return received_nb_signals > 1;
}
-static int exit_program(int ret)
+void exit_program(int ret)
{
int i;
@@ -483,7 +483,6 @@ static int exit_program(int ret)
}
exit(ret); /* not all OS-es handle main() return value */
- return ret;
}
static void assert_avoptions(AVDictionary *m)
@@ -4192,5 +4191,6 @@ int main(int argc, char **argv)
printf("bench: utime=%0.3fs maxrss=%ikB\n", ti / 1000000.0, maxrss);
}
- return exit_program(0);
+ exit_program(0);
+ return 0;
}