diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2015-04-29 16:44:21 +0300 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2015-04-29 17:35:24 +0300 |
commit | 36f862e04c2afe37c1fd541e01013c6cef4c6015 (patch) | |
tree | 3983371af49a7234d87bf999b35b17875db09a64 /libavcodec/h264.h | |
parent | 07a79cf8694ac685ae8f579ccc33d113eb46fe3d (diff) | |
parent | a0f2946068c62e18cb05ac25c0df3d86077251a6 (diff) |
Merge commit 'a0f2946068c62e18cb05ac25c0df3d86077251a6'
* commit 'a0f2946068c62e18cb05ac25c0df3d86077251a6':
h264: use properly allocated AVFrames
Conflicts:
libavcodec/h264.c
libavcodec/h264.h
libavcodec/h264_refs.c
libavcodec/h264_slice.c
libavcodec/svq3.c
libavcodec/vda_h264.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/h264.h')
-rw-r--r-- | libavcodec/h264.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/libavcodec/h264.h b/libavcodec/h264.h index 7ab1fdfda1..95db912465 100644 --- a/libavcodec/h264.h +++ b/libavcodec/h264.h @@ -290,8 +290,7 @@ typedef struct MMCO { } MMCO; typedef struct H264Picture { - struct AVFrame f; - uint8_t avframe_padding[1024]; // hack to allow linking to a avutil with larger AVFrame + AVFrame *f; ThreadFrame tf; AVBufferRef *qscale_table_buf; |