Commit 525f5897 authored by Vittorio Giovara's avatar Vittorio Giovara

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
parent 285fe5b0
...@@ -30,6 +30,7 @@ ...@@ -30,6 +30,7 @@
struct MpegEncContext; struct MpegEncContext;
#define MAX_MV 2048 #define MAX_MV 2048
#define ME_MAP_SIZE 64
#define FF_ME_ZERO 0 #define FF_ME_ZERO 0
#define FF_ME_EPZS 1 #define FF_ME_EPZS 1
......
...@@ -28,6 +28,10 @@ ...@@ -28,6 +28,10 @@
#include "avcodec.h" #include "avcodec.h"
#include "version.h" #include "version.h"
/**
* Return value for header parsers if frame is not coded.
* */
#define FRAME_SKIPPED 100
/* picture type */ /* picture type */
#define PICT_TOP_FIELD 1 #define PICT_TOP_FIELD 1
...@@ -40,6 +44,8 @@ ...@@ -40,6 +44,8 @@
*/ */
#define DELAYED_PIC_REF 4 #define DELAYED_PIC_REF 4
#define MAX_MB_BYTES (30 * 16 * 16 * 3 / 8 + 120)
#define MAX_FCODE 7
/* MB types */ /* MB types */
#if !FF_API_MB_TYPE #if !FF_API_MB_TYPE
...@@ -114,6 +120,7 @@ ...@@ -114,6 +120,7 @@
#define CANDIDATE_MB_TYPE_DIRECT0 (1 << 12) #define CANDIDATE_MB_TYPE_DIRECT0 (1 << 12)
#define INPLACE_OFFSET 16
enum OutputFormat { enum OutputFormat {
FMT_MPEG1, FMT_MPEG1,
......
...@@ -56,20 +56,10 @@ ...@@ -56,20 +56,10 @@
#include "libavutil/opt.h" #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_THREADS 16
#define MAX_B_FRAMES 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. */ /* Start codes. */
#define SEQ_END_CODE 0x000001b7 #define SEQ_END_CODE 0x000001b7
#define SEQ_START_CODE 0x000001b3 #define SEQ_START_CODE 0x000001b3
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment