diff options
| author | Vittorio Giovara <vittorio.giovara@gmail.com> | 2015-09-12 15:58:47 +0200 |
|---|---|---|
| committer | Vittorio Giovara <vittorio.giovara@gmail.com> | 2015-09-13 17:34:45 +0200 |
| commit | 525f58977c93e189fda49a5c4928feaf4d89fac6 (patch) | |
| tree | d2b551ed34f1e2b6b2bf387376aeff31fd807fac | |
| parent | 285fe5b098c8fbefaed4aacdb839b760a5b7f20d (diff) | |
| download | ffmpeg-525f58977c93e189fda49a5c4928feaf4d89fac6.tar.gz | |
mpegvideo: Move macros to more appropriate headers
MAX_MB_BYTES -> mpegutils.h
FRAME_SKIPPED -> mpegutils.h
INPLACE_OFFSET -> mpegutils.h
ME_MAP_SIZE -> motion_est.h
| -rw-r--r-- | libavcodec/motion_est.h | 1 | ||||
| -rw-r--r-- | libavcodec/mpegutils.h | 7 | ||||
| -rw-r--r-- | libavcodec/mpegvideo.h | 10 |
3 files changed, 8 insertions, 10 deletions
diff --git a/libavcodec/motion_est.h b/libavcodec/motion_est.h index a5c662f8c5..3b63972d6e 100644 --- a/libavcodec/motion_est.h +++ b/libavcodec/motion_est.h @@ -30,6 +30,7 @@ struct MpegEncContext; #define MAX_MV 2048 +#define ME_MAP_SIZE 64 #define FF_ME_ZERO 0 #define FF_ME_EPZS 1 diff --git a/libavcodec/mpegutils.h b/libavcodec/mpegutils.h index 9b5a5767b9..60f971222e 100644 --- a/libavcodec/mpegutils.h +++ b/libavcodec/mpegutils.h @@ -28,6 +28,10 @@ #include "avcodec.h" #include "version.h" +/** + * Return value for header parsers if frame is not coded. + * */ +#define FRAME_SKIPPED 100 /* picture type */ #define PICT_TOP_FIELD 1 @@ -40,6 +44,8 @@ */ #define DELAYED_PIC_REF 4 +#define MAX_MB_BYTES (30 * 16 * 16 * 3 / 8 + 120) +#define MAX_FCODE 7 /* MB types */ #if !FF_API_MB_TYPE @@ -114,6 +120,7 @@ #define CANDIDATE_MB_TYPE_DIRECT0 (1 << 12) +#define INPLACE_OFFSET 16 enum OutputFormat { FMT_MPEG1, diff --git a/libavcodec/mpegvideo.h b/libavcodec/mpegvideo.h index cb449faef2..52c6f91d20 100644 --- a/libavcodec/mpegvideo.h +++ b/libavcodec/mpegvideo.h @@ -56,20 +56,10 @@ #include "libavutil/opt.h" -#define FRAME_SKIPPED 100 ///< return value for header parsers if frame is not coded - -#define MAX_FCODE 7 - #define MAX_THREADS 16 #define MAX_B_FRAMES 16 -#define ME_MAP_SIZE 64 - -#define MAX_MB_BYTES (30*16*16*3/8 + 120) - -#define INPLACE_OFFSET 16 - /* Start codes. */ #define SEQ_END_CODE 0x000001b7 #define SEQ_START_CODE 0x000001b3 |