aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnton Khirnov <anton@khirnov.net>2012-01-12 11:17:23 +0100
committerAnton Khirnov <anton@khirnov.net>2012-01-27 10:38:30 +0100
commit7063b6eaee5b10afc3e3157e10e4be0c04537107 (patch)
tree646b2917e77efaacc48debf5fd9cfb15d31fd1e5
parent570f6aaab12e2bcf6605e9e3a5e1204b3cfccfc1 (diff)
downloadffmpeg-7063b6eaee5b10afc3e3157e10e4be0c04537107.tar.gz
lavc: increase major version to 54.
The lavf-ffm test results change because ffmenc writes AVCodecContext.flags/flags2 and the defaults for those change.
-rw-r--r--doc/APIchanges2
-rw-r--r--libavcodec/version.h4
-rw-r--r--tests/ref/lavf/ffm2
3 files changed, 4 insertions, 4 deletions
diff --git a/doc/APIchanges b/doc/APIchanges
index aa5729196e..706acfb009 100644
--- a/doc/APIchanges
+++ b/doc/APIchanges
@@ -2,7 +2,7 @@ Never assume the API of libav* to be stable unless at least 1 month has passed
since the last major version increase.
The last version increases were:
-libavcodec: 2011-04-18
+libavcodec: 2012-01-27
libavdevice: 2011-04-18
libavfilter: 2011-04-18
libavformat: 2011-04-18
diff --git a/libavcodec/version.h b/libavcodec/version.h
index 95d0baa612..5042f4dc54 100644
--- a/libavcodec/version.h
+++ b/libavcodec/version.h
@@ -20,8 +20,8 @@
#ifndef AVCODEC_VERSION_H
#define AVCODEC_VERSION_H
-#define LIBAVCODEC_VERSION_MAJOR 53
-#define LIBAVCODEC_VERSION_MINOR 36
+#define LIBAVCODEC_VERSION_MAJOR 54
+#define LIBAVCODEC_VERSION_MINOR 0
#define LIBAVCODEC_VERSION_MICRO 0
#define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
diff --git a/tests/ref/lavf/ffm b/tests/ref/lavf/ffm
index cdfec4d1fb..73e94ddfd6 100644
--- a/tests/ref/lavf/ffm
+++ b/tests/ref/lavf/ffm
@@ -1,3 +1,3 @@
-bf46c0b53fc318d0a60fa9bf446b2e4f *./tests/data/lavf/lavf.ffm
+4ef091d638bb20b8eaef5b3a0d6f97b7 *./tests/data/lavf/lavf.ffm
376832 ./tests/data/lavf/lavf.ffm
./tests/data/lavf/lavf.ffm CRC=0xf361ed74