[FFmpeg-cvslog] avcodec: Add padding after the remaining AVFrames
Michael Niedermayer
git at videolan.org
Sun Mar 23 21:12:16 CET 2014
ffmpeg | branch: release/2.2 | Michael Niedermayer <michaelni at gmx.at> | Tue Mar 18 00:08:54 2014 +0100| [0c88d539f8284d8625749febffd9e7ca8ef2b3be] | committer: Michael Niedermayer
avcodec: Add padding after the remaining AVFrames
This limits ABI issues in case libavcodec is linked to a libavutil with larger AVFrame
Which can happen if they are shiped in seperate binary packages and libavutil is upgraded
A cleaner alternative would be to replace them by pointers but this would likely cause
a small speedloss
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit fc567ac49e17151f00f31b59030cd10f952612ef)
Conflicts:
libavcodec/h264.h
(cherry picked from commit 618d062bd553a7d7fad194d4236913f2b0a0251e)
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0c88d539f8284d8625749febffd9e7ca8ef2b3be
---
libavcodec/mpegvideo.h | 1 +
libavcodec/utils.c | 1 +
2 files changed, 2 insertions(+)
diff --git a/libavcodec/mpegvideo.h b/libavcodec/mpegvideo.h
index 92aac6d..0811e62 100644
--- a/libavcodec/mpegvideo.h
+++ b/libavcodec/mpegvideo.h
@@ -99,6 +99,7 @@ struct MpegEncContext;
*/
typedef struct Picture{
struct AVFrame f;
+ uint8_t avframe_padding[1024]; // hack to allow linking to a avutil with larger AVFrame
ThreadFrame tf;
AVBufferRef *qscale_table_buf;
diff --git a/libavcodec/utils.c b/libavcodec/utils.c
index cd04ca2..19df3cc 100644
--- a/libavcodec/utils.c
+++ b/libavcodec/utils.c
@@ -807,6 +807,7 @@ int avcodec_default_get_buffer(AVCodecContext *avctx, AVFrame *frame)
typedef struct CompatReleaseBufPriv {
AVCodecContext avctx;
AVFrame frame;
+ uint8_t avframe_padding[1024]; // hack to allow linking to a avutil with larger AVFrame
} CompatReleaseBufPriv;
static void compat_free_buffer(void *opaque, uint8_t *data)
More information about the ffmpeg-cvslog
mailing list