Rename unique_id to the way michaelni likes it. (xvmc_id)

[ffmpeg] / cmdutils.c

diff --git a/cmdutils.c b/cmdutils.c
index 20291aaba49f9c02f654a3f6cb5153b4a2478659..d5fb6cff7bb9f346ce2c7fdb0212dd67a5fd115a 100644 (file)
--- a/cmdutils.c
+++ b/cmdutils.c
@@ -30,14 +30,10 @@
 
 #include "config.h"
 #include "libavformat/avformat.h"
-#if CONFIG_AVFILTER
 #include "libavfilter/avfilter.h"
-#endif
 #include "libavdevice/avdevice.h"
 #include "libswscale/swscale.h"
-#if CONFIG_POSTPROC
 #include "libpostproc/postprocess.h"
-#endif
 #include "libavutil/avstring.h"
 #include "libavcodec/opt.h"
 #include "cmdutils.h"
@@ -54,6 +50,8 @@ AVCodecContext *avctx_opts[CODEC_TYPE_NB];
 AVFormatContext *avformat_opts;
 struct SwsContext *sws_opts;
 
+const int this_year = 2009;
+
 double parse_number_or_die(const char *context, const char *numstr, int type, double min, double max)
 {
     char *tail;
@@ -292,8 +290,8 @@ static void print_all_lib_versions(FILE* outstream, int indent)
 
 void show_banner(void)
 {
-    fprintf(stderr, "%s version " FFMPEG_VERSION ", Copyright (c) %d-2009 Fabrice Bellard, et al.\n",
-            program_name, program_birth_year);
+    fprintf(stderr, "%s version " FFMPEG_VERSION ", Copyright (c) %d-%d Fabrice Bellard, et al.\n",
+            program_name, program_birth_year, this_year);
     fprintf(stderr, "  configuration: " FFMPEG_CONFIGURATION "\n");
     print_all_lib_versions(stderr, 1);
     fprintf(stderr, "  built on " __DATE__ " " __TIME__);