[FFmpeg-cvslog] ffmpeg: 10l add back show_banner() that was lost in the last merge.
Michael Niedermayer
git at videolan.org
Mon Nov 21 00:23:47 CET 2011
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Nov 21 00:06:23 2011 +0100| [9b622418505099e0b3076ad67041d126c44a93f2] | committer: Michael Niedermayer
ffmpeg: 10l add back show_banner() that was lost in the last merge.
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9b622418505099e0b3076ad67041d126c44a93f2
---
avconv.c | 1 +
ffmpeg.c | 1 +
2 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/avconv.c b/avconv.c
index a019ffa..3d67f85 100644
--- a/avconv.c
+++ b/avconv.c
@@ -4358,6 +4358,7 @@ int main(int argc, char **argv)
av_register_all();
avformat_network_init();
+ show_banner();
/* parse options */
parse_options(&o, argc, argv, options, opt_output_file);
diff --git a/ffmpeg.c b/ffmpeg.c
index 507c35d..623716a 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -4732,6 +4732,7 @@ int main(int argc, char **argv)
av_register_all();
avformat_network_init();
+ show_banner();
term_init();
More information about the ffmpeg-cvslog
mailing list