[FFmpeg-cvslog] cmdutils: make this_year extern, so it can be referenced from other . o files

Stefano Sabatini git at videolan.org
Sat Jan 7 11:09:06 CET 2012


ffmpeg | branch: master | Stefano Sabatini <stefasab at gmail.com> | Wed Jan  4 01:52:58 2012 +0100| [e869d08cbceee27f08e77eb54eef93740f5df00b] | committer: Stefano Sabatini

cmdutils: make this_year extern, so it can be referenced from other .o files

Required by a pending change in ffprobe.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e869d08cbceee27f08e77eb54eef93740f5df00b
---

 cmdutils.c |    2 +-
 cmdutils.h |    5 +++++
 2 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/cmdutils.c b/cmdutils.c
index 0ab98e8..36e472a 100644
--- a/cmdutils.c
+++ b/cmdutils.c
@@ -54,7 +54,7 @@
 struct SwsContext *sws_opts;
 AVDictionary *format_opts, *codec_opts;
 
-static const int this_year = 2012;
+const int this_year = 2012;
 
 static FILE *report_file;
 
diff --git a/cmdutils.h b/cmdutils.h
index b9ea1cf..61d0788 100644
--- a/cmdutils.h
+++ b/cmdutils.h
@@ -43,6 +43,11 @@ extern const char program_name[];
  */
 extern const int program_birth_year;
 
+/**
+ * this year, defined by the program for show_banner()
+ */
+extern const int this_year;
+
 extern AVCodecContext *avcodec_opts[AVMEDIA_TYPE_NB];
 extern AVFormatContext *avformat_opts;
 extern struct SwsContext *sws_opts;



More information about the ffmpeg-cvslog mailing list