diff options
| author | Vittorio Giovara <vittorio.giovara@gmail.com> | 2015-05-31 15:49:55 +0200 |
|---|---|---|
| committer | Vittorio Giovara <vittorio.giovara@gmail.com> | 2015-06-08 12:39:42 +0100 |
| commit | 925b80d64029d41962e5998d7d901226c3a9baea (patch) | |
| tree | 83a31b30fc6b944669e5b06adb5164ecb8b200e3 | |
| parent | 9bb11be0e5a75782c3139ad058c2b571499aa37d (diff) | |
| download | ffmpeg-925b80d64029d41962e5998d7d901226c3a9baea.tar.gz | |
mpegvideo: Move OutFormat enum to mpegutils.h
It is necessary to avoid circular header dependencies.
| -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 3d0d1dee26..5167e867dd 100644 --- 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 9446724f30..5c503fb600 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 b8740a27c0..d5e14f7c46 100644 --- 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 52be052537..cf25b56141 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 7e0da935b5..c9a382d405 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" |