Merge remote-tracking branch 'qatar/master'

[ffmpeg] / libavcodec / dnxhddata.h

diff --git a/libavcodec/dnxhddata.h b/libavcodec/dnxhddata.h
index 32c77db0efc4fe4a88e447ba99ea31e46ecf202c..6e774b5c885748f01ce53ddd5bc8426884af859f 100644 (file)
--- a/libavcodec/dnxhddata.h
+++ b/libavcodec/dnxhddata.h
@@ -33,11 +33,12 @@ typedef struct {
     unsigned int coding_unit_size;
     int index_bits;
     int bit_depth;
+    int eob_index;
     const uint8_t *luma_weight, *chroma_weight;
     const uint8_t *dc_codes, *dc_bits;
     const uint16_t *ac_codes;
     const uint8_t *ac_bits, *ac_level;
-    const uint8_t *ac_run_flag, *ac_index_flag;
+    const uint8_t *ac_flags;
     const uint16_t *run_codes;
     const uint8_t *run_bits, *run;
     int bit_rates[5]; ///< Helpher to choose variants, rounded to nearest 5Mb/s
@@ -46,6 +47,6 @@ typedef struct {
 extern const CIDEntry ff_dnxhd_cid_table[];
 
 int ff_dnxhd_get_cid_table(int cid);
-int ff_dnxhd_find_cid(AVCodecContext *avctx);
+int ff_dnxhd_find_cid(AVCodecContext *avctx, int bit_depth);
 
 #endif /* AVCODEC_DNXHDDATA_H */