[FFmpeg-cvslog] avcodec/vc1: Factorize imode enum out / remove duplication

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Dec 14 05:16:25 2013 +0100| [2cfccd8060b9c4c61ae861a2842469708c71de72] | committer: Michael Niedermayer

avcodec/vc1: Factorize imode enum out / remove duplication

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=2cfccd8060b9c4c61ae861a2842469708c71de72
---

 libavcodec/vc1.c    |   15 ---------------
 libavcodec/vc1.h    |   15 +++++++++++++++
 libavcodec/vc1dec.c |   14 --------------
 3 files changed, 15 insertions(+), 29 deletions(-)

diff --git a/libavcodec/vc1.c b/libavcodec/vc1.c
index 181a4df..38e03e8 100644
--- a/libavcodec/vc1.c
+++ b/libavcodec/vc1.c
@@ -47,21 +47,6 @@
  * @{
  */
 
-/**
- * Imode types
- * @{
- */
-enum Imode {
-    IMODE_RAW,
-    IMODE_NORM2,
-    IMODE_DIFF2,
-    IMODE_NORM6,
-    IMODE_DIFF6,
-    IMODE_ROWSKIP,
-    IMODE_COLSKIP
-};
-/** @} */ //imode defines
-
 /** Decode rows by checking if they are skipped
  * @param plane Buffer to store decoded bits
  * @param[in] width Width of this buffer
diff --git a/libavcodec/vc1.h b/libavcodec/vc1.h
index 0cf4e0f..0d23b44 100644
--- a/libavcodec/vc1.h
+++ b/libavcodec/vc1.h
@@ -175,6 +175,21 @@ enum FrameCodingMode {
     ILACE_FIELD         ///<  in the bitstream is reported as 11b
 };
 
+/**
+ * Imode types
+ * @{
+ */
+enum Imode {
+    IMODE_RAW,
+    IMODE_NORM2,
+    IMODE_DIFF2,
+    IMODE_NORM6,
+    IMODE_DIFF6,
+    IMODE_ROWSKIP,
+    IMODE_COLSKIP
+};
+/** @} */ //imode defines
+
 /** The VC1 Context
  * @todo Change size wherever another size is more efficient
  * Many members are only used for Advanced Profile
diff --git a/libavcodec/vc1dec.c b/libavcodec/vc1dec.c
index 061ece1..8d6a044 100644
--- a/libavcodec/vc1dec.c
+++ b/libavcodec/vc1dec.c
@@ -59,20 +59,6 @@ static const int offset_table2[9] = {  0,  1,  3,  7, 15, 31, 63, 127, 255 };
  * @{
  */
 
-/**
- * Imode types
- * @{
- */
-enum Imode {
-    IMODE_RAW,
-    IMODE_NORM2,
-    IMODE_DIFF2,
-    IMODE_NORM6,
-    IMODE_DIFF6,
-    IMODE_ROWSKIP,
-    IMODE_COLSKIP
-};
-/** @} */ //imode defines
 
 static void init_block_index(VC1Context *v)
 {