Module: libav Branch: release/12 Commit: abdef279d50b98aaf862a03807bb30b59b84290c
Author: James Almer <[email protected]> Committer: Anton Khirnov <[email protected]> Date: Thu Oct 13 10:53:41 2016 -0300 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 <[email protected]> Signed-off-by: Anton Khirnov <[email protected]> (cherry picked from commit 6c31ba226968f12f898120dbb928dab34e03782b) Signed-off-by: Anton Khirnov <[email protected]> Conflicts: libavformat/version.h --- 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 1e1105f..2cb8077 100644 --- a/libavformat/version.h +++ b/libavformat/version.h @@ -31,7 +31,7 @@ #define LIBAVFORMAT_VERSION_MAJOR 57 #define LIBAVFORMAT_VERSION_MINOR 7 -#define LIBAVFORMAT_VERSION_MICRO 1 +#define LIBAVFORMAT_VERSION_MICRO 2 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \ LIBAVFORMAT_VERSION_MINOR, \ _______________________________________________ libav-commits mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-commits
