diff options
| author | wm4 <nfxjfg@googlemail.com> | 2014-03-20 08:53:16 +0100 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2014-03-20 16:59:46 +0100 |
| commit | 7948a51b5c3d08e1a1173442a7ff72b220def303 (patch) | |
| tree | 4abdb8bc18abd3cbcec525a5f958689107bd89c6 /libavcodec/vdpau_internal.h | |
| parent | 82bb3048013201c0095d2853d4623633d912252f (diff) | |
vdpau: don't assume Picture and H264Picture are the same
The code passed H264Picture* and Picture*, and assumed the
hwaccel_picture_private field was in the same place in both
structs. Somehow this happened to work in Libav, but broke in
FFmpeg (and probably subtly breaks in Libav too).
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Diffstat (limited to 'libavcodec/vdpau_internal.h')
| -rw-r--r-- | libavcodec/vdpau_internal.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libavcodec/vdpau_internal.h b/libavcodec/vdpau_internal.h index 50c4f5e74c..94c81ff78e 100644 --- a/libavcodec/vdpau_internal.h +++ b/libavcodec/vdpau_internal.h @@ -70,9 +70,10 @@ struct vdpau_picture_context { VdpBitstreamBuffer *bitstream_buffers; }; -int ff_vdpau_common_start_frame(Picture *pic, +int ff_vdpau_common_start_frame(struct vdpau_picture_context *pic, const uint8_t *buffer, uint32_t size); int ff_vdpau_mpeg_end_frame(AVCodecContext *avctx); -int ff_vdpau_add_buffer(Picture *pic, const uint8_t *buf, uint32_t buf_size); +int ff_vdpau_add_buffer(struct vdpau_picture_context *pic, const uint8_t *buf, + uint32_t buf_size); #endif /* AVCODEC_VDPAU_INTERNAL_H */ |