x86: dsputil: Simplify xvmc deprecation conditional

[ffmpeg] / libavcodec / utvideo.h

diff --git a/libavcodec/utvideo.h b/libavcodec/utvideo.h
index ed6ae86fb9fbda306097e3e0b88e3a902f46b034..0a1317e8076ebcdbd822abe7137516cfb48ff963 100644 (file)
--- a/libavcodec/utvideo.h
+++ b/libavcodec/utvideo.h
@@ -65,7 +65,6 @@ extern const int ff_ut_rgb_order[4];
 
 typedef struct UtvideoContext {
     AVCodecContext *avctx;
-    AVFrame        pic;
     DSPContext     dsp;
 
     uint32_t frame_info_size, flags, frame_info;
@@ -75,7 +74,8 @@ typedef struct UtvideoContext {
     int      interlaced;
     int      frame_pred;
 
-    uint8_t *slice_bits, *slice_buffer;
+    int      slice_stride;
+    uint8_t *slice_bits, *slice_buffer[4];
     int      slice_bits_size;
 } UtvideoContext;