virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-02-09 14:14:39 +02:00
Code Issues Releases Activity

Merge commit '525f58977c93e189fda49a5c4928feaf4d89fac6'

Browse Source 
* commit '525f58977c93e189fda49a5c4928feaf4d89fac6':
  mpegvideo: Move macros to more appropriate headers

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
This commit is contained in:
Hendrik Leppkes 2015-09-16 11:23:20 +02:00
commit b3ff8ef6ec
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; struct MpegEncContext;
#define MAX_MV 4096 #define MAX_MV 4096
#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

7
libavcodec/mpegutils.h
View File

@ -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 @@
*/ */
#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 @@
#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,

10
libavcodec/mpegvideo.h
View File

@ -58,20 +58,10 @@
#include "libavutil/opt.h" #include "libavutil/opt.h"
#include "libavutil/timecode.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_THREADS 32
#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