Revert "Merge commit 'd1d7678040cd60148f97b372cb4291bcc45b2e22'"

[ffmpeg] / libavcodec / dnxhdenc.h

diff --git a/libavcodec/dnxhdenc.h b/libavcodec/dnxhdenc.h
index 3f531efcfbfef0bc05a4429f405b71b10c9ba6aa..7f8e7b35f2173bb38a0bf620acf056136e18bc97 100644 (file)
--- a/libavcodec/dnxhdenc.h
+++ b/libavcodec/dnxhdenc.h
@@ -45,6 +45,7 @@ typedef struct DNXHDEncContext {
     MpegEncContext m; ///< Used for quantization dsp functions
 
     int cid;
+    int profile;
     const CIDEntry *cid_table;
     uint8_t *msip; ///< Macroblock Scan Indexes Payload
     uint32_t *slice_size;
@@ -58,6 +59,10 @@ typedef struct DNXHDEncContext {
     unsigned dct_uv_offset;
     unsigned block_width_l2;
 
+    int frame_size;
+    int coding_unit_size;
+    int data_offset;
+
     int interlaced;
     int cur_field;
 
@@ -89,7 +94,7 @@ typedef struct DNXHDEncContext {
     uint8_t  *mb_qscale;
 
     RCCMPEntry *mb_cmp;
-    RCEntry   (*mb_rc)[8160];
+    RCEntry    *mb_rc;
 
     void (*get_pixels_8x4_sym)(int16_t * /* align 16 */,
                                const uint8_t *, ptrdiff_t);