[FFmpeg-cvslog] avformat/matroska: fix MatroskaVideoFieldOrder enum values

James Almer git at videolan.org
Thu Mar 23 17:41:24 EET 2017


ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Thu Oct 13 10:53:41 2016 -0300| [6c31ba226968f12f898120dbb928dab34e03782b] | committer: Anton Khirnov

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 at gmail.com>
Signed-off-by: Anton Khirnov <anton at khirnov.net>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6c31ba226968f12f898120dbb928dab34e03782b
---

 libavformat/matroska.h | 4 ++--
 libavformat/version.h  | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/libavformat/matroska.h b/libavformat/matroska.h
index a13de18..91bb978 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 a6643a9..c329c2f 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, \



More information about the ffmpeg-cvslog mailing list