aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-02-17 03:55:49 +0100
committerMichael Niedermayer <michaelni@gmx.at>2013-02-17 04:24:30 +0100
commitd34cfb33afb8c6e3c349e71d752beb9234afbcf0 (patch)
treefdcb9ea44dd7d90e4a17475edafe62fc63271228
parent13093f9767b922661132a3c1f4b5ba2c7338b660 (diff)
downloadffmpeg-d34cfb33afb8c6e3c349e71d752beb9234afbcf0.tar.gz
update for 0.5.11n0.5.11
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--RELEASE2
-rw-r--r--VERSION2
-rw-r--r--cmdutils.c2
3 files changed, 3 insertions, 3 deletions
diff --git a/RELEASE b/RELEASE
index 0b9bf42c83..2677b999a8 100644
--- a/RELEASE
+++ b/RELEASE
@@ -235,7 +235,7 @@ the Changelog file or the Git commit history.
-* 0.5.10 Feb 16, 2013
+* 0.5.11 Feb 17, 2013
General notes
-------------
diff --git a/VERSION b/VERSION
index 50c76ef872..69626fb929 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.5.10
+0.5.11
diff --git a/cmdutils.c b/cmdutils.c
index f1e5352362..7c4c1a0080 100644
--- a/cmdutils.c
+++ b/cmdutils.c
@@ -50,7 +50,7 @@ AVCodecContext *avctx_opts[CODEC_TYPE_NB];
AVFormatContext *avformat_opts;
struct SwsContext *sws_opts;
-const int this_year = 2012;
+const int this_year = 2013;
double parse_number_or_die(const char *context, const char *numstr, int type, double min, double max)
{