mpegvideo: Move OutFormat enum to mpegutils.h

It is necessary to avoid circular header dependencies.

diff --git a/libavcodec/h263dec.c b/libavcodec/h263dec.c
index 3d0d1dee266c9fb863164a31ba84550cedfdb1d3..5167e867ddbcb3cde2252ad04cd25eefbf0cf48d 100644 (file)
--- a/libavcodec/h263dec.c
+++ b/libavcodec/h263dec.c
@@ -35,6 +35,7 @@
 #include "mpeg_er.h"
 #include "mpeg4video.h"
 #include "mpeg4video_parser.h"
+#include "mpegutils.h"
 #include "mpegvideo.h"
 #include "msmpeg4.h"
 #include "qpeldsp.h"

diff --git a/libavcodec/mpegutils.h b/libavcodec/mpegutils.h
index 9446724f30ffa888d6beb9568aeb1b10cb0f3db8..5c503fb6009796d768880ceecf481d6f7d60a0f7 100644 (file)
--- a/libavcodec/mpegutils.h
+++ b/libavcodec/mpegutils.h
@@ -115,6 +115,14 @@
 #define CANDIDATE_MB_TYPE_DIRECT0    (1 << 12)
 
 
+enum OutputFormat {
+    FMT_MPEG1,
+    FMT_H261,
+    FMT_H263,
+    FMT_MJPEG,
+};
+
+
 /**
  * Draw a horizontal band if supported.
  *

diff --git a/libavcodec/mpegvideo.h b/libavcodec/mpegvideo.h
index b8740a27c0d9bff27d0dd8795e7457ca1357b1aa..d5e14f7c4624c5f3c7246a512e63a27ab55d3c7e 100644 (file)
--- a/libavcodec/mpegvideo.h
+++ b/libavcodec/mpegvideo.h
@@ -46,6 +46,7 @@
 #include "put_bits.h"
 #include "ratecontrol.h"
 #include "parser.h"
+#include "mpegutils.h"
 #include "mpeg12data.h"
 #include "qpeldsp.h"
 #include "thread.h"
@@ -55,13 +56,6 @@
 
 #define FRAME_SKIPPED 100 ///< return value for header parsers if frame is not coded
 
-enum OutputFormat {
-    FMT_MPEG1,
-    FMT_H261,
-    FMT_H263,
-    FMT_MJPEG,
-};
-
 #define MAX_FCODE 7
 
 #define MAX_THREADS 16

diff --git a/libavcodec/rv10.c b/libavcodec/rv10.c
index 52be052537bb6ea9dee97a3434086a47c6b4d23e..cf25b56141b0f77d23f4ac4313ddcabf1507375f 100644 (file)
--- a/libavcodec/rv10.c
+++ b/libavcodec/rv10.c
@@ -34,6 +34,7 @@
 #include "h263.h"
 #include "internal.h"
 #include "mpeg_er.h"
+#include "mpegutils.h"
 #include "mpegvideo.h"
 #include "mpeg4video.h"
 #include "mpegvideodata.h"

diff --git a/libavcodec/wmv2.c b/libavcodec/wmv2.c
index 7e0da935b54a113a819905d41d94682716bcac48..c9a382d405c7dd3f46535cffc4e1e852b774ed21 100644 (file)
--- a/libavcodec/wmv2.c
+++ b/libavcodec/wmv2.c
@@ -20,6 +20,7 @@
 
 #include "avcodec.h"
 #include "idctdsp.h"
+#include "mpegutils.h"
 #include "mpegvideo.h"
 #include "msmpeg4data.h"
 #include "simple_idct.h"