aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-07-20 18:34:16 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-07-20 18:34:16 +0200
commita81f72e482312c9f958737f675dc67d00c05b2b1 (patch)
treec8fa3872ba9458204bd875ca0584c91ac223b4b2
parent24a0273cb86ec0b8bf17c71e7f426c3aa9e4989f (diff)
downloadffmpeg-a81f72e482312c9f958737f675dc67d00c05b2b1.tar.gz
Update for 0.5.14n0.5.14
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--VERSION2
-rw-r--r--cmdutils.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/VERSION b/VERSION
index 964783a811..83ac1cc02f 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.5.13
+0.5.14
diff --git a/cmdutils.c b/cmdutils.c
index 7c4c1a0080..8534c60aba 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 = 2013;
+const int this_year = 2014;
double parse_number_or_die(const char *context, const char *numstr, int type, double min, double max)
{