From 77c20198bbbb2b48ddef15784217e786200853f3 Mon Sep 17 00:00:00 2001
From: Johan Andersson <j@i19.se>
Date: Sat, 3 Jan 2015 17:31:36 +0100
Subject: [PATCH] cmdutils: update copyright year to 2015.

(cherry picked from commit 3e160652219ff4da433f5672ae1e5f4956abb815)

Conflicts:

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

diff --git a/cmdutils.c b/cmdutils.c
index 1068baf3d8..c67f7e3c8a 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;