aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat
diff options
context:
space:
mode:
authorJames Almer <jamrial@gmail.com>2016-10-13 10:53:41 -0300
committerAnton Khirnov <anton@khirnov.net>2016-10-16 19:02:53 +0200
commit6c31ba226968f12f898120dbb928dab34e03782b (patch)
tree31be4389610067301e48fb54ff56c3605b662029 /libavformat
parent20b75970e43a030f959b17ff2dfd561174b6f24e (diff)
downloadffmpeg-6c31ba226968f12f898120dbb928dab34e03782b.tar.gz
avformat/matroska: fix MatroskaVideoFieldOrder enum values
The spec says 9: Interlaced with bottom field displayed first and top field stored first 14: Interlaced with top field displayed first and bottom field stored first And avcodec.h states AV_FIELD_TB, //< Top coded first, bottom displayed first AV_FIELD_BT, //< Bottom coded first, top displayed first Signed-off-by: James Almer <jamrial@gmail.com> Signed-off-by: Anton Khirnov <anton@khirnov.net>
Diffstat (limited to 'libavformat')
-rw-r--r--libavformat/matroska.h4
-rw-r--r--libavformat/version.h2
2 files changed, 3 insertions, 3 deletions
diff --git a/libavformat/matroska.h b/libavformat/matroska.h
index a13de18ef1..91bb978422 100644
--- a/libavformat/matroska.h
+++ b/libavformat/matroska.h
@@ -233,8 +233,8 @@ typedef enum {
MATROSKA_VIDEO_FIELDORDER_UNDETERMINED = 2,
MATROSKA_VIDEO_FIELDORDER_TT = 1,
MATROSKA_VIDEO_FIELDORDER_BB = 6,
- MATROSKA_VIDEO_FIELDORDER_BT = 9,
- MATROSKA_VIDEO_FIELDORDER_TB = 14,
+ MATROSKA_VIDEO_FIELDORDER_TB = 9,
+ MATROSKA_VIDEO_FIELDORDER_BT = 14,
} MatroskaVideoFieldOrder;
typedef enum {
diff --git a/libavformat/version.h b/libavformat/version.h
index a6643a9e25..c329c2f302 100644
--- a/libavformat/version.h
+++ b/libavformat/version.h
@@ -30,7 +30,7 @@
#include "libavutil/version.h"
#define LIBAVFORMAT_VERSION_MAJOR 57
-#define LIBAVFORMAT_VERSION_MINOR 8
+#define LIBAVFORMAT_VERSION_MINOR 9
#define LIBAVFORMAT_VERSION_MICRO 0
#define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \