[FFmpeg-cvslog] avutil/frame: Move new field to the end of AVFrame
Michael Niedermayer
git at videolan.org
Thu Jun 30 17:45:54 CEST 2016
ffmpeg | branch: master | Michael Niedermayer <michael at niedermayer.cc> | Thu Jun 30 14:02:27 2016 +0200| [042fb69deb5303d147b21ab1061387fb6e0c7afc] | committer: Michael Niedermayer
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 at niedermayer.cc>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=042fb69deb5303d147b21ab1061387fb6e0c7afc
---
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 44adec4..2b5c332 100644
--- a/libavutil/frame.h
+++ b/libavutil/frame.h
@@ -428,12 +428,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:
* av_frame_get_best_effort_timestamp(frame)
@@ -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 aa10622..07618fc 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, \
More information about the ffmpeg-cvslog
mailing list