Re: [libav-devel] [PATCH] avformat/matroska: fix MatroskaVideoFieldOrder enum values

2016-10-13 Thread Luca Barbato
On 13/10/2016 15:53, James Almer wrote:
> 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 
> ---
> Should also go into libav 12. This feature is only a couple months old
> so it's not affecting any other stable release.
> 

Sure, why not?

___
libav-devel mailing list
libav-devel@libav.org
https://lists.libav.org/mailman/listinfo/libav-devel


[libav-devel] [PATCH] avformat/matroska: fix MatroskaVideoFieldOrder enum values

2016-10-13 Thread James Almer
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 
---
Should also go into libav 12. This feature is only a couple months old
so it's not affecting any other stable release.

A check for files created with old lavf versions in the matroska demuxer
to detect wrongly muxed files and workaround them would also be a good
idea.
Minor version is bumped for this purpose.

 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, \
-- 
2.9.1

___
libav-devel mailing list
libav-devel@libav.org
https://lists.libav.org/mailman/listinfo/libav-devel