diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-06-08 22:05:20 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-06-08 22:05:25 +0200 |
| commit | 83e3516e64dcc1581ae7503be3aaca6a34be7194 (patch) | |
| tree | d2c8b6abe6b91cfc783185490f3dddcf55415501 | |
| parent | 3244a176505b04f62f7bbb1ac7fb413399a6790c (diff) | |
| parent | 925b80d64029d41962e5998d7d901226c3a9baea (diff) | |
Merge commit '925b80d64029d41962e5998d7d901226c3a9baea'
* commit '925b80d64029d41962e5998d7d901226c3a9baea':
mpegvideo: Move OutFormat enum to mpegutils.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -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 a210772698..15f073ae66 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 6d59c22424..37cc391c23 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 865951647d..749c088a34 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 b009367304..b53e602de1 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 963bda05ec..0ebe02db45 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" |