MAX_MB_BYTES -> mpegutils.h
FRAME_SKIPPED -> mpegutils.h
INPLACE_OFFSET -> mpegutils.h
ME_MAP_SIZE -> motion_est.h
---
libavcodec/motion_est.h | 1 +
libavcodec/mpegutils.h | 7 +++++++
libavcodec/mpegvideo.h | 10 ----------
3 files changed, 8 insertions(+), 10 deletions(-)
diff --git a/libavcodec/motion_est.h b/libavcodec/motion_est.h
index a5c662f..3b63972 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 9b5a576..60f9712 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 92e6ae1..f47237a 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
--
1.9.5 (Apple Git-50.3)
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
