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 /libavcodec/mpegvideo.h | |
| 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>
Diffstat (limited to 'libavcodec/mpegvideo.h')
| -rw-r--r-- | libavcodec/mpegvideo.h | 8 |
1 files changed, 1 insertions, 7 deletions
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 |