diff options
-rw-r--r-- | libavcodec/h263dec.c | 1 | ||||
-rw-r--r-- | libavcodec/mpegutils.h | 8 | ||||
-rw-r--r-- | libavcodec/mpegvideo.h | 8 | ||||
-rw-r--r-- | libavcodec/rv10.c | 1 | ||||
-rw-r--r-- | libavcodec/wmv2.c | 1 |
5 files changed, 12 insertions, 7 deletions
diff --git a/libavcodec/h263dec.c b/libavcodec/h263dec.c index a210772..15f073a 100644 --- a/libavcodec/h263dec.c +++ b/libavcodec/h263dec.c @@ -37,6 +37,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 6d59c22..37cc391 100644 --- 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 8659516..749c088 100644 --- a/libavcodec/mpegvideo.h +++ b/libavcodec/mpegvideo.h @@ -47,6 +47,7 @@ #include "put_bits.h" #include "ratecontrol.h" #include "parser.h" +#include "mpegutils.h" #include "mpeg12data.h" #include "qpeldsp.h" #include "thread.h" @@ -57,13 +58,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 32 diff --git a/libavcodec/rv10.c b/libavcodec/rv10.c index b009367..b53e602 100644 --- 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 963bda0..0ebe02d 100644 --- 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" |