diff options
| author | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2011-04-20 09:44:08 +0200 |
|---|---|---|
| committer | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2011-04-20 09:44:08 +0200 |
| commit | ddb00ad1d8aba9cdd9ae4b3156512c3f22e2c5a3 (patch) | |
| tree | b330188a75a7364166aa89ed633ea9d5650553cc /libavcodec | |
| parent | efb5fa79f5ca34140db357a00c999286097ab53e (diff) | |
| download | ffmpeg-ddb00ad1d8aba9cdd9ae4b3156512c3f22e2c5a3.tar.gz | |
Move the info union to the end of the vdpau_render_state struct.
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/vdpau.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/libavcodec/vdpau.h b/libavcodec/vdpau.h index ab5f682c62..0dc6fb850b 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; }; /* @}*/ |