[FFmpeg-cvslog] cmdutils: update copyright year to 2015.

Johan Andersson git at videolan.org
Fri Mar 13 17:49:00 CET 2015


ffmpeg | branch: release/1.1 | Johan Andersson <j at i19.se> | Sat Jan  3 17:31:36 2015 +0100| [77c20198bbbb2b48ddef15784217e786200853f3] | 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=77c20198bbbb2b48ddef15784217e786200853f3
---

 cmdutils.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cmdutils.c b/cmdutils.c
index 1068baf..c67f7e3 100644
--- a/cmdutils.c
+++ b/cmdutils.c
@@ -65,7 +65,7 @@ struct SwsContext *sws_opts;
 SwrContext *swr_opts;
 AVDictionary *format_opts, *codec_opts;
 
-const int this_year = 2014;
+const int this_year = 2015;
 
 static FILE *report_file;
 



More information about the ffmpeg-cvslog mailing list