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/mpegutils.h | |
| parent | 3244a176505b04f62f7bbb1ac7fb413399a6790c (diff) | |
| parent | 925b80d64029d41962e5998d7d901226c3a9baea (diff) | |
| download | ffmpeg-83e3516e64dcc1581ae7503be3aaca6a34be7194.tar.gz | |
Merge commit '925b80d64029d41962e5998d7d901226c3a9baea'
* commit '925b80d64029d41962e5998d7d901226c3a9baea':
mpegvideo: Move OutFormat enum to mpegutils.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mpegutils.h')
| -rw-r--r-- | libavcodec/mpegutils.h | 8 |
1 files changed, 8 insertions, 0 deletions
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. * |