Merge commit 'd0aabeab23755ee906440505ad2097c0f1493e80'

[ffmpeg] / libavcodec / vdpau_internal.h

diff --git a/libavcodec/vdpau_internal.h b/libavcodec/vdpau_internal.h
index fd7eec610d163d72bc8fbf08e797e572de0be699..604298c877e5abc981620aec65a62631617dadee 100644 (file)
--- a/libavcodec/vdpau_internal.h
+++ b/libavcodec/vdpau_internal.h
@@ -36,10 +36,10 @@
 #include "mpegvideo.h"
 #include "version.h"
 
-/** Extract VdpVideoSurface from a Picture */
-static inline uintptr_t ff_vdpau_get_surface_id(AVFrame *frm)
+/** Extract VdpVideoSurface from an AVFrame */
+static inline uintptr_t ff_vdpau_get_surface_id(AVFrame *pic)
 {
-    return (uintptr_t)frm->data[3];
+    return (uintptr_t)pic->data[3];
 }
 
 #if CONFIG_VDPAU
@@ -77,10 +77,11 @@ struct vdpau_picture_context {
 };
 #endif
 
-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);
 
 
 void ff_vdpau_add_data_chunk(uint8_t *data, const uint8_t *buf,