dxva2: Keep code shared between dxva2 and d3d11va under the correct #if

[ffmpeg] / libavcodec / ffv1.h

diff --git a/libavcodec/ffv1.h b/libavcodec/ffv1.h
index 43c96079ae5fe3bfdc902d741b9e0c965b3ff1ac..34370fa143b7e778e7c34b8d2968763bae389da3 100644 (file)
--- a/libavcodec/ffv1.h
+++ b/libavcodec/ffv1.h
@@ -26,7 +26,6 @@
 #include <stdint.h>
 
 #include "avcodec.h"
-#include "dsputil.h"
 #include "get_bits.h"
 #include "put_bits.h"
 #include "rangecoder.h"
@@ -37,6 +36,10 @@
 #define MAX_QUANT_TABLES 8
 #define MAX_CONTEXT_INPUTS 5
 
+#define AC_GOLOMB_RICE          0
+#define AC_RANGE_DEFAULT_TAB    1
+#define AC_RANGE_CUSTOM_TAB     2
+
 extern const uint8_t ff_log2_run[41];
 
 extern const int8_t ffv1_quant5_10bit[256];
@@ -79,7 +82,9 @@ typedef struct FFV1Context {
     int transparency;
     int flags;
     int picture_number;
-    AVFrame picture, last_picture;
+    int key_frame;
+    const AVFrame *frame;
+    AVFrame *last_picture;
 
     AVFrame *cur;
     int plane_count;
@@ -98,6 +103,7 @@ typedef struct FFV1Context {
     int ec;
     int slice_damaged;
     int key_frame_ok;
+    int context_model;
 
     int bits_per_raw_sample;
     int packed_at_lsb;
@@ -105,8 +111,6 @@ typedef struct FFV1Context {
     int gob_count;
     int quant_table_count;
 
-    DSPContext dsp;
-
     struct FFV1Context *slice_context[MAX_SLICES];
     int slice_count;
     int num_v_slices;