diff options
| author | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-09-16 11:23:20 +0200 |
|---|---|---|
| committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-09-16 11:23:20 +0200 |
| commit | b3ff8ef6ec239085f41ee3b0b68d7ac0a4142226 (patch) | |
| tree | af1213f437b4037bc5df38e73c7ae35e4192713d | |
| parent | 643a1560024f52ba56b56e812820765b3ae03be6 (diff) | |
| parent | 525f58977c93e189fda49a5c4928feaf4d89fac6 (diff) | |
| download | ffmpeg-b3ff8ef6ec239085f41ee3b0b68d7ac0a4142226.tar.gz | |
Merge commit '525f58977c93e189fda49a5c4928feaf4d89fac6'
* commit '525f58977c93e189fda49a5c4928feaf4d89fac6':
mpegvideo: Move macros to more appropriate headers
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| -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 e09f705eee..df9e3c7e85 100644 --- a/libavcodec/motion_est.h +++ b/libavcodec/motion_est.h @@ -30,6 +30,7 @@ struct MpegEncContext; #define MAX_MV 4096 +#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 6ac5cef4fd..9cfadfc4cf 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 b47a4f38aa..750388ac25 100644 --- a/libavcodec/mpegvideo.h +++ b/libavcodec/mpegvideo.h @@ -58,20 +58,10 @@ #include "libavutil/opt.h" #include "libavutil/timecode.h" -#define FRAME_SKIPPED 100 ///< return value for header parsers if frame is not coded - -#define MAX_FCODE 7 - #define MAX_THREADS 32 #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 |