summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2015-03-12 00:54:14 +0100
committerMichael Niedermayer <michaelni@gmx.at>2015-03-12 00:54:14 +0100
commit6f4cda4a6b66cb3882c63e18a35937284c446c44 (patch)
tree1bac689aad04b29e0e205bfc693c29da7e7ab582
parent98b0751e895e6065cfae65008bee402481a4158c (diff)
downloadffmpeg-6f4cda4a6b66cb3882c63e18a35937284c446c44.tar.gz
Update for 0.7.17n0.7.17
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--Doxyfile2
-rw-r--r--RELEASE2
-rw-r--r--VERSION2
-rw-r--r--cmdutils.c2
4 files changed, 4 insertions, 4 deletions
diff --git a/Doxyfile b/Doxyfile
index 2b03049d02..be951830ef 100644
--- a/Doxyfile
+++ b/Doxyfile
@@ -31,7 +31,7 @@ PROJECT_NAME = FFmpeg
# This could be handy for archiving the generated documentation or
# if some version control system is used.
-PROJECT_NUMBER = 0.7.16
+PROJECT_NUMBER = 0.7.17
# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
# base path where the generated documentation will be put.
diff --git a/RELEASE b/RELEASE
index bf7b715d27..b22af294b9 100644
--- a/RELEASE
+++ b/RELEASE
@@ -1 +1 @@
-0.7.16
+0.7.17
diff --git a/VERSION b/VERSION
index bf7b715d27..b22af294b9 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.7.16
+0.7.17
diff --git a/cmdutils.c b/cmdutils.c
index b919bae92e..21922ae304 100644
--- a/cmdutils.c
+++ b/cmdutils.c
@@ -57,7 +57,7 @@ AVFormatContext *avformat_opts;
struct SwsContext *sws_opts;
AVDictionary *format_opts, *video_opts, *audio_opts, *sub_opts;
-static const int this_year = 2013;
+static const int this_year = 2015;
void init_opts(void)
{