ffmpeg | branch: master | Vittorio Giovara <vittorio.giov...@gmail.com> | Sun May 31 15:49:55 2015 +0200| [925b80d64029d41962e5998d7d901226c3a9baea] | committer: Vittorio Giovara
mpegvideo: Move OutFormat enum to mpegutils.h It is necessary to avoid circular header dependencies. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=925b80d64029d41962e5998d7d901226c3a9baea --- libavcodec/h263dec.c | 1 + libavcodec/mpegutils.h | 8 ++++++++ libavcodec/mpegvideo.h | 8 +------- libavcodec/rv10.c | 1 + libavcodec/wmv2.c | 1 + 5 files changed, 12 insertions(+), 7 deletions(-) diff --git a/libavcodec/h263dec.c b/libavcodec/h263dec.c index 3d0d1de..5167e86 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 9446724..5c503fb 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 b8740a2..d5e14f7 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 52be052..cf25b56 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 7e0da93..c9a382d 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" _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
