[FFmpeg-cvslog] avcodec/vdpau_internal: move "struct vdpau_picture_context" up to avoid " #else"

Michael Niedermayer git at videolan.org
Thu May 22 01:58:53 CEST 2014


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu May 22 01:53:54 2014 +0200| [f932e5f7169282daaa06b08500d2c632cf70e14e] | committer: Michael Niedermayer

avcodec/vdpau_internal: move "struct vdpau_picture_context" up to avoid "#else"

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f932e5f7169282daaa06b08500d2c632cf70e14e
---

 libavcodec/vdpau_internal.h |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/libavcodec/vdpau_internal.h b/libavcodec/vdpau_internal.h
index a7319ed..0f3652b 100644
--- a/libavcodec/vdpau_internal.h
+++ b/libavcodec/vdpau_internal.h
@@ -42,6 +42,7 @@ static inline uintptr_t ff_vdpau_get_surface_id(AVFrame *pic)
     return (uintptr_t)pic->data[3];
 }
 
+struct vdpau_picture_context;
 #if CONFIG_VDPAU
 #if !FF_API_BUFS_VDPAU
 union AVVDPAUPictureInfo {
@@ -75,8 +76,6 @@ struct vdpau_picture_context {
      */
     VdpBitstreamBuffer *bitstream_buffers;
 };
-#else
-struct vdpau_picture_context;
 #endif
 
 int ff_vdpau_common_start_frame(struct vdpau_picture_context *pic,



More information about the ffmpeg-cvslog mailing list