diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-04-29 15:44:21 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-04-29 16:35:24 +0200 |
| commit | 36f862e04c2afe37c1fd541e01013c6cef4c6015 (patch) | |
| tree | 3983371af49a7234d87bf999b35b17875db09a64 /libavcodec/vda_h264.c | |
| 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/vda_h264.c')
| -rw-r--r-- | libavcodec/vda_h264.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/vda_h264.c b/libavcodec/vda_h264.c index 2a183302d0..8ea81d8d2e 100644 --- a/libavcodec/vda_h264.c +++ b/libavcodec/vda_h264.c @@ -143,7 +143,7 @@ static int vda_old_h264_end_frame(AVCodecContext *avctx) H264Context *h = avctx->priv_data; VDAContext *vda = avctx->internal->hwaccel_priv_data; struct vda_context *vda_ctx = avctx->hwaccel_context; - AVFrame *frame = &h->cur_pic_ptr->f; + AVFrame *frame = h->cur_pic_ptr->f; struct vda_buffer *context; AVBufferRef *buffer; int status; @@ -375,7 +375,7 @@ static int vda_h264_end_frame(AVCodecContext *avctx) H264Context *h = avctx->priv_data; VDAContext *vda = avctx->internal->hwaccel_priv_data; AVVDAContext *vda_ctx = avctx->hwaccel_context; - AVFrame *frame = &h->cur_pic_ptr->f; + AVFrame *frame = h->cur_pic_ptr->f; uint32_t flush_flags = 1 << 0; ///< kVDADecoderFlush_emitFrames CFDataRef coded_frame; OSStatus status; |