diff options
| author | Andreas Rheinhardt <andreas.rheinhardt@outlook.com> | 2022-10-16 22:02:42 +0200 |
|---|---|---|
| committer | Andreas Rheinhardt <andreas.rheinhardt@outlook.com> | 2022-10-20 06:57:30 +0200 |
| commit | 85f02c300f2ad07807ffa92a6273cc38b03da141 (patch) | |
| tree | 6ebd1c1a5872f610c12db2d9fa3ac795239b179b | |
| parent | 9e32f2ebfd19e0266537e7d92f52ba53242c9520 (diff) | |
| download | ffmpeg-85f02c300f2ad07807ffa92a6273cc38b03da141.tar.gz | |
avcodec/mpegvideo: Move VIDEO_FORMAT_* defines to mpeg12enc.c
Forgotten in f899e3b51bc85c45f54f7ac64abfbde6b2cd7d3d.
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
| -rw-r--r-- | libavcodec/mpeg12enc.c | 6 | ||||
| -rw-r--r-- | libavcodec/mpegvideo.h | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/libavcodec/mpeg12enc.c b/libavcodec/mpeg12enc.c index 01cfd1c1fa..c3df924b64 100644 --- a/libavcodec/mpeg12enc.c +++ b/libavcodec/mpeg12enc.c @@ -83,6 +83,12 @@ typedef struct MPEG12EncContext { int a53_cc; int seq_disp_ext; int video_format; +#define VIDEO_FORMAT_COMPONENT 0 +#define VIDEO_FORMAT_PAL 1 +#define VIDEO_FORMAT_NTSC 2 +#define VIDEO_FORMAT_SECAM 3 +#define VIDEO_FORMAT_MAC 4 +#define VIDEO_FORMAT_UNSPECIFIED 5 } MPEG12EncContext; #define A53_MAX_CC_COUNT 0x1f diff --git a/libavcodec/mpegvideo.h b/libavcodec/mpegvideo.h index 1ddf8034aa..daaa7c95b4 100644 --- a/libavcodec/mpegvideo.h +++ b/libavcodec/mpegvideo.h @@ -445,12 +445,6 @@ typedef struct MpegEncContext { int brd_scale; int intra_vlc_format; int alternate_scan; -#define VIDEO_FORMAT_COMPONENT 0 -#define VIDEO_FORMAT_PAL 1 -#define VIDEO_FORMAT_NTSC 2 -#define VIDEO_FORMAT_SECAM 3 -#define VIDEO_FORMAT_MAC 4 -#define VIDEO_FORMAT_UNSPECIFIED 5 int repeat_first_field; int chroma_420_type; int chroma_format; |