From 77473002898f1dce18761c8a9bca48a8fe888d2e Mon Sep 17 00:00:00 2001
From: Michael Niedermayer <michael@niedermayer.cc>
Date: Thu, 30 Jun 2016 14:02:27 +0200
Subject: [PATCH] avutil/frame: Move new field to the end of AVFrame
This fixes part of Ticket5676
This fixes kodi, mpv, chromium and ffplay build against 3.0 and linked to 3.1
This is a similar ABI fix to 1eb43af1a0e542ad83dcbf327197785d815fc42d
Approved-by: BBB
Approved-by: jamrial
Approved-by: BtbN
Approved-by: nevcairiel
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 042fb69deb5303d147b21ab1061387fb6e0c7afc)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
---
libavutil/frame.h | 11 +++++------
libavutil/version.h | 2 +-
2 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/libavutil/frame.h b/libavutil/frame.h
index 44adec4602..2b5c3320c3 100644
--- a/libavutil/frame.h
+++ b/libavutil/frame.h
@@ -427,12 +427,6 @@ typedef struct AVFrame {
enum AVChromaLocation chroma_location;
- /**
- * For hwaccel-format frames, this should be a reference to the
- * AVHWFramesContext describing the frame.
- */
- AVBufferRef *hw_frames_ctx;
-
/**
* frame timestamp estimated using various heuristics, in stream time base
* Code outside libavutil should access this field using:
@@ -524,6 +518,11 @@ typedef struct AVFrame {
*/
AVBufferRef *qp_table_buf;
#endif
+ /**
+ * For hwaccel-format frames, this should be a reference to the
+ * AVHWFramesContext describing the frame.
+ */
+ AVBufferRef *hw_frames_ctx;
} AVFrame;
/**
diff --git a/libavutil/version.h b/libavutil/version.h
index aa10622840..07618fc0bc 100644
--- a/libavutil/version.h
+++ b/libavutil/version.h
@@ -64,7 +64,7 @@
*/
#define LIBAVUTIL_VERSION_MAJOR 55
-#define LIBAVUTIL_VERSION_MINOR 27
+#define LIBAVUTIL_VERSION_MINOR 28
#define LIBAVUTIL_VERSION_MICRO 100
#define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \