[FFmpeg-cvslog] Move the info union to the end of the vdpau_render_state struct.
Carl Eugen Hoyos
git at videolan.org
Wed Apr 20 09:44:54 CEST 2011
ffmpeg | branch: master | Carl Eugen Hoyos <cehoyos at ag.or.at> | Wed Apr 20 09:44:08 2011 +0200| [ddb00ad1d8aba9cdd9ae4b3156512c3f22e2c5a3] | committer: Carl Eugen Hoyos
Move the info union to the end of the vdpau_render_state struct.
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ddb00ad1d8aba9cdd9ae4b3156512c3f22e2c5a3
---
libavcodec/vdpau.h | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/libavcodec/vdpau.h b/libavcodec/vdpau.h
index ab5f682..0dc6fb8 100644
--- a/libavcodec/vdpau.h
+++ b/libavcodec/vdpau.h
@@ -67,6 +67,13 @@ struct vdpau_render_state {
int state; ///< Holds FF_VDPAU_STATE_* values.
+ /** Describe size/location of the compressed video data.
+ Set to 0 when freeing bitstream_buffers. */
+ int bitstream_buffers_allocated;
+ int bitstream_buffers_used;
+ /** The user is responsible for freeing this buffer using av_freep(). */
+ VdpBitstreamBuffer *bitstream_buffers;
+
/** picture parameter information for all supported codecs */
union VdpPictureInfo {
VdpPictureInfoH264 h264;
@@ -74,13 +81,6 @@ struct vdpau_render_state {
VdpPictureInfoVC1 vc1;
VdpPictureInfoMPEG4Part2 mpeg4;
} info;
-
- /** Describe size/location of the compressed video data.
- Set to 0 when freeing bitstream_buffers. */
- int bitstream_buffers_allocated;
- int bitstream_buffers_used;
- /** The user is responsible for freeing this buffer using av_freep(). */
- VdpBitstreamBuffer *bitstream_buffers;
};
/* @}*/
More information about the ffmpeg-cvslog
mailing list