MrBesen/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

mpegvideo: Move macros to more appropriate headers

Browse Source 
MAX_MB_BYTES -> mpegutils.h
FRAME_SKIPPED -> mpegutils.h
INPLACE_OFFSET -> mpegutils.h
ME_MAP_SIZE -> motion_est.h
This commit is contained in:
Vittorio Giovara 2015-09-12 15:58:47 +02:00
parent 285fe5b098
commit 525f58977c
3 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libavcodec/motion_est.h
View File

@ -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

7
libavcodec/mpegutils.h
View File

@ -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,

10
libavcodec/mpegvideo.h
View File

@ -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