avcodec/vdpau: remove incompatible-libav-abi hack from vdpau_render_state struct
authorwm4 <nfxjfg@googlemail.com>
Sat, 5 Sep 2015 19:45:26 +0000 (16:45 -0300)
committerJames Almer <jamrial@gmail.com>
Sat, 5 Sep 2015 19:45:26 +0000 (16:45 -0300)
libavcodec/vdpau.h

index a42ca01..17cc263 100644 (file)
@@ -231,10 +231,8 @@ struct vdpau_render_state {
 
     int state; ///< Holds FF_VDPAU_STATE_* values.
 
-#if AV_HAVE_INCOMPATIBLE_LIBAV_ABI
     /** picture parameter information for all supported codecs */
     union AVVDPAUPictureInfo info;
-#endif
 
     /** Describe size/location of the compressed video data.
         Set to 0 when freeing bitstream_buffers. */
@@ -242,11 +240,6 @@ struct vdpau_render_state {
     int bitstream_buffers_used;
     /** The user is responsible for freeing this buffer using av_freep(). */
     VdpBitstreamBuffer *bitstream_buffers;
-
-#if !AV_HAVE_INCOMPATIBLE_LIBAV_ABI
-    /** picture parameter information for all supported codecs */
-    union AVVDPAUPictureInfo info;
-#endif
 };
 #endif