Merge commit '525f5897'

* commit '525f5897':
  mpegvideo: Move macros to more appropriate headers
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

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

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,

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