ffmpeg | branch: release/0.10 | Johan Andersson <j...@i19.se> | Sat Jan 3 17:31:36 2015 +0100| [b3242c0f2293e2fac8c80c3bfb444d6d20f29bb2] | 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=b3242c0f2293e2fac8c80c3bfb444d6d20f29bb2 --- cmdutils.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmdutils.c b/cmdutils.c index bba6f8c..c76ae51 100644 --- a/cmdutils.c +++ b/cmdutils.c @@ -56,7 +56,7 @@ struct SwsContext *sws_opts; AVDictionary *format_opts, *codec_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