ffmpeg | branch: release/1.2 | Johan Andersson <j...@i19.se> | Sat Jan 3
17:31:36 2015 +0100| [5410d6d26fc603df80915a9bce863cbcd3eb1fc4] | committer:
Michael Niedermayer
cmdutils: update copyright year to 2015.
(cherry picked from commit 3e160652219ff4da433f5672ae1e5f4956abb815)
Conflicts:
cmdutils.c
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5410d6d26fc603df80915a9bce863cbcd3eb1fc4
---
cmdutils.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/cmdutils.c b/cmdutils.c
index 576d810..c8cb2be 100644
--- a/cmdutils.c
+++ b/cmdutils.c
@@ -65,7 +65,7 @@ struct SwsContext *sws_opts;
AVDictionary *swr_opts;
AVDictionary *format_opts, *codec_opts, *resample_opts;
-const int this_year = 2014;
+const int this_year = 2015;
static FILE *report_file;
_______________________________________________
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
