diracdec: move the MAX_DWT_LEVELS macro to dirac.h

Used by the VC-2 encoder.

Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>

diff --git a/libavcodec/dirac.h b/libavcodec/dirac.h
index cb80fdc1bffb29497e92ff2b188cedeb506155f9..e6d9d346d9cc13c23092f5e1f4501d20157e1def 100644 (file)
--- a/libavcodec/dirac.h
+++ b/libavcodec/dirac.h
@@ -33,6 +33,17 @@
 
 #include "avcodec.h"
 
+/**
+ * The spec limits the number of wavelet decompositions to 4 for both
+ * level 1 (VC-2) and 128 (long-gop default).
+ * 5 decompositions is the maximum before >16-bit buffers are needed.
+ * Schroedinger allows this for DD 9,7 and 13,7 wavelets only, limiting
+ * the others to 4 decompositions (or 3 for the fidelity filter).
+ *
+ * We use this instead of MAX_DECOMPOSITIONS to save some memory.
+ */
+#define MAX_DWT_LEVELS 5
+
 /**
  * Parse code values:
  *

diff --git a/libavcodec/diracdec.c b/libavcodec/diracdec.c
index ca44e7be1146ae7b422fa041718c1925e01acb2f..50a35e1543e24a6a69db5eafe8c32b81b68cb364 100644 (file)
--- a/libavcodec/diracdec.c
+++ b/libavcodec/diracdec.c
@@ -37,20 +37,10 @@
 #include "mpegvideoencdsp.h"
 #include "dirac_dwt.h"
 #include "dirac.h"
+#include "diractab.h"
 #include "diracdsp.h"
 #include "videodsp.h"
 
-/**
- * The spec limits the number of wavelet decompositions to 4 for both
- * level 1 (VC-2) and 128 (long-gop default).
- * 5 decompositions is the maximum before >16-bit buffers are needed.
- * Schroedinger allows this for DD 9,7 and 13,7 wavelets only, limiting
- * the others to 4 decompositions (or 3 for the fidelity filter).
- *
- * We use this instead of MAX_DECOMPOSITIONS to save some memory.
- */
-#define MAX_DWT_LEVELS 5
-
 /**
  * The spec limits this to 3 for frame coding, but in practice can be as high as 6
  */