Also adjust the headers as needed.
---
libavcodec/error_resilience.c | 1 +
libavcodec/h261dec.c | 1 +
libavcodec/h261enc.c | 1 +
libavcodec/h263.c | 1 +
libavcodec/h264.h | 1 +
libavcodec/ituh263dec.c | 1 +
libavcodec/mbtype.h | 75 +++++++++++++++++++++++++++++++++++++++++++
libavcodec/motion_est.c | 1 +
libavcodec/mpeg12dec.c | 1 +
libavcodec/mpeg4video.c | 1 +
libavcodec/mpeg4videodec.c | 1 +
libavcodec/mpegvideo.c | 1 +
libavcodec/mpegvideo.h | 49 ----------------------------
libavcodec/mpegvideo_motion.c | 1 +
libavcodec/msmpeg4dec.c | 1 +
libavcodec/rv30.c | 1 +
libavcodec/rv34.c | 1 +
libavcodec/rv40.c | 1 +
libavcodec/vc1dec.c | 1 +
libavcodec/wmv2dec.c | 1 +
20 files changed, 93 insertions(+), 49 deletions(-)
create mode 100644 libavcodec/mbtype.h
diff --git a/libavcodec/error_resilience.c b/libavcodec/error_resilience.c
index 0707368..fc2bcf5 100644
--- a/libavcodec/error_resilience.c
+++ b/libavcodec/error_resilience.c
@@ -30,6 +30,7 @@
#include "libavutil/internal.h"
#include "avcodec.h"
#include "error_resilience.h"
+#include "mbtype.h"
#include "mpegvideo.h"
#include "rectangle.h"
#include "thread.h"
diff --git a/libavcodec/h261dec.c b/libavcodec/h261dec.c
index 49eaee1..c7f572a 100644
--- a/libavcodec/h261dec.c
+++ b/libavcodec/h261dec.c
@@ -26,6 +26,7 @@
*/
#include "avcodec.h"
+#include "mbtype.h"
#include "mpegvideo.h"
#include "h263.h"
#include "h261.h"
diff --git a/libavcodec/h261enc.c b/libavcodec/h261enc.c
index 4cff998..398f5f6 100644
--- a/libavcodec/h261enc.c
+++ b/libavcodec/h261enc.c
@@ -27,6 +27,7 @@
#include "libavutil/attributes.h"
#include "avcodec.h"
+#include "mbtype.h"
#include "mpegvideo.h"
#include "h263.h"
#include "h261.h"
diff --git a/libavcodec/h263.c b/libavcodec/h263.c
index 2fa6ca3..c532f73 100644
--- a/libavcodec/h263.c
+++ b/libavcodec/h263.c
@@ -34,6 +34,7 @@
#include "h263.h"
#include "h263data.h"
#include "mathops.h"
+#include "mbtype.h"
#include "unary.h"
#include "flv.h"
#include "mpeg4video.h"
diff --git a/libavcodec/h264.h b/libavcodec/h264.h
index 254d619..b6716d1 100644
--- a/libavcodec/h264.h
+++ b/libavcodec/h264.h
@@ -38,6 +38,7 @@
#include "h264dsp.h"
#include "h264pred.h"
#include "h264qpel.h"
+#include "mbtype.h"
#include "picttype.h"
#include "rectangle.h"
diff --git a/libavcodec/ituh263dec.c b/libavcodec/ituh263dec.c
index e365210..84eea23 100644
--- a/libavcodec/ituh263dec.c
+++ b/libavcodec/ituh263dec.c
@@ -36,6 +36,7 @@
#include "mpegvideo.h"
#include "h263.h"
#include "mathops.h"
+#include "mbtype.h"
#include "unary.h"
#include "flv.h"
#include "mpeg4video.h"
diff --git a/libavcodec/mbtype.h b/libavcodec/mbtype.h
new file mode 100644
index 0000000..8cd9fbc
--- /dev/null
+++ b/libavcodec/mbtype.h
@@ -0,0 +1,75 @@
+/*
+ * Generic macroblock types
+ *
+ * This file is part of Libav.
+ *
+ * Libav is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * Libav is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include "version.h"
+
+#ifndef AVCODEC_MBTYPE_H
+#define AVCODEC_MBTYPE_H
+
+#if !FF_API_MB_TYPE
+#define MB_TYPE_INTRA4x4 0x0001
+#define MB_TYPE_INTRA16x16 0x0002 //FIXME H.264-specific
+#define MB_TYPE_INTRA_PCM 0x0004 //FIXME H.264-specific
+#define MB_TYPE_16x16 0x0008
+#define MB_TYPE_16x8 0x0010
+#define MB_TYPE_8x16 0x0020
+#define MB_TYPE_8x8 0x0040
+#define MB_TYPE_INTERLACED 0x0080
+#define MB_TYPE_DIRECT2 0x0100 //FIXME
+#define MB_TYPE_ACPRED 0x0200
+#define MB_TYPE_GMC 0x0400
+#define MB_TYPE_SKIP 0x0800
+#define MB_TYPE_P0L0 0x1000
+#define MB_TYPE_P1L0 0x2000
+#define MB_TYPE_P0L1 0x4000
+#define MB_TYPE_P1L1 0x8000
+#define MB_TYPE_L0 (MB_TYPE_P0L0 | MB_TYPE_P1L0)
+#define MB_TYPE_L1 (MB_TYPE_P0L1 | MB_TYPE_P1L1)
+#define MB_TYPE_L0L1 (MB_TYPE_L0 | MB_TYPE_L1)
+#define MB_TYPE_QUANT 0x00010000
+#define MB_TYPE_CBP 0x00020000
+#endif
+
+#define MB_TYPE_INTRA MB_TYPE_INTRA4x4 //default mb_type if there is just one
type
+#define IS_INTRA4x4(a) ((a)&MB_TYPE_INTRA4x4)
+#define IS_INTRA16x16(a) ((a)&MB_TYPE_INTRA16x16)
+#define IS_PCM(a) ((a)&MB_TYPE_INTRA_PCM)
+#define IS_INTRA(a) ((a)&7)
+#define IS_INTER(a)
((a)&(MB_TYPE_16x16|MB_TYPE_16x8|MB_TYPE_8x16|MB_TYPE_8x8))
+#define IS_SKIP(a) ((a)&MB_TYPE_SKIP)
+#define IS_INTRA_PCM(a) ((a)&MB_TYPE_INTRA_PCM)
+#define IS_INTERLACED(a) ((a)&MB_TYPE_INTERLACED)
+#define IS_DIRECT(a) ((a)&MB_TYPE_DIRECT2)
+#define IS_GMC(a) ((a)&MB_TYPE_GMC)
+#define IS_16X16(a) ((a)&MB_TYPE_16x16)
+#define IS_16X8(a) ((a)&MB_TYPE_16x8)
+#define IS_8X16(a) ((a)&MB_TYPE_8x16)
+#define IS_8X8(a) ((a)&MB_TYPE_8x8)
+#define IS_SUB_8X8(a) ((a)&MB_TYPE_16x16) //note reused
+#define IS_SUB_8X4(a) ((a)&MB_TYPE_16x8) //note reused
+#define IS_SUB_4X8(a) ((a)&MB_TYPE_8x16) //note reused
+#define IS_SUB_4X4(a) ((a)&MB_TYPE_8x8) //note reused
+#define IS_ACPRED(a) ((a)&MB_TYPE_ACPRED)
+#define IS_QUANT(a) ((a)&MB_TYPE_QUANT)
+#define IS_DIR(a, part, list) ((a) & (MB_TYPE_P0L0<<((part)+2*(list))))
+#define USES_LIST(a, list) ((a) & ((MB_TYPE_P0L0|MB_TYPE_P1L0)<<(2*(list))))
///< does this mb use listX, note does not work if subMBs
+#define HAS_CBP(a) ((a)&MB_TYPE_CBP)
+
+#endif /* AVCODEC_MBTYPE_H */
diff --git a/libavcodec/motion_est.c b/libavcodec/motion_est.c
index 04ae49e..1ff00d3 100644
--- a/libavcodec/motion_est.c
+++ b/libavcodec/motion_est.c
@@ -33,6 +33,7 @@
#include "avcodec.h"
#include "mathops.h"
+#include "mbtype.h"
#include "mpegvideo.h"
#undef NDEBUG
diff --git a/libavcodec/mpeg12dec.c b/libavcodec/mpeg12dec.c
index 3cc76f8..f2dfc4e 100644
--- a/libavcodec/mpeg12dec.c
+++ b/libavcodec/mpeg12dec.c
@@ -34,6 +34,7 @@
#include "dsputil.h"
#include "error_resilience.h"
#include "internal.h"
+#include "mbtype.h"
#include "mpeg12.h"
#include "mpeg12data.h"
#include "mpegvideo.h"
diff --git a/libavcodec/mpeg4video.c b/libavcodec/mpeg4video.c
index 979904f..9c0a2e9 100644
--- a/libavcodec/mpeg4video.c
+++ b/libavcodec/mpeg4video.c
@@ -20,6 +20,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#include "mbtype.h"
#include "mpegvideo.h"
#include "mpeg4video.h"
#include "mpeg4data.h"
diff --git a/libavcodec/mpeg4videodec.c b/libavcodec/mpeg4videodec.c
index b6925ac..ac0b128 100644
--- a/libavcodec/mpeg4videodec.c
+++ b/libavcodec/mpeg4videodec.c
@@ -22,6 +22,7 @@
#include "error_resilience.h"
#include "internal.h"
+#include "mbtype.h"
#include "mpegvideo.h"
#include "mpeg4video.h"
#include "h263.h"
diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c
index 0473d92..61427c3 100644
--- a/libavcodec/mpegvideo.c
+++ b/libavcodec/mpegvideo.c
@@ -36,6 +36,7 @@
#include "dsputil.h"
#include "internal.h"
#include "mathops.h"
+#include "mbtype.h"
#include "mpegvideo.h"
#include "mjpegenc.h"
#include "msmpeg4.h"
diff --git a/libavcodec/mpegvideo.h b/libavcodec/mpegvideo.h
index c7f3ac1..da64d79 100644
--- a/libavcodec/mpegvideo.h
+++ b/libavcodec/mpegvideo.h
@@ -103,30 +103,6 @@ typedef struct Picture{
AVBufferRef *mb_type_buf;
uint32_t *mb_type;
-#if !FF_API_MB_TYPE
-#define MB_TYPE_INTRA4x4 0x0001
-#define MB_TYPE_INTRA16x16 0x0002 //FIXME H.264-specific
-#define MB_TYPE_INTRA_PCM 0x0004 //FIXME H.264-specific
-#define MB_TYPE_16x16 0x0008
-#define MB_TYPE_16x8 0x0010
-#define MB_TYPE_8x16 0x0020
-#define MB_TYPE_8x8 0x0040
-#define MB_TYPE_INTERLACED 0x0080
-#define MB_TYPE_DIRECT2 0x0100 //FIXME
-#define MB_TYPE_ACPRED 0x0200
-#define MB_TYPE_GMC 0x0400
-#define MB_TYPE_SKIP 0x0800
-#define MB_TYPE_P0L0 0x1000
-#define MB_TYPE_P1L0 0x2000
-#define MB_TYPE_P0L1 0x4000
-#define MB_TYPE_P1L1 0x8000
-#define MB_TYPE_L0 (MB_TYPE_P0L0 | MB_TYPE_P1L0)
-#define MB_TYPE_L1 (MB_TYPE_P0L1 | MB_TYPE_P1L1)
-#define MB_TYPE_L0L1 (MB_TYPE_L0 | MB_TYPE_L1)
-#define MB_TYPE_QUANT 0x00010000
-#define MB_TYPE_CBP 0x00020000
-#endif
-
AVBufferRef *mbskip_table_buf;
uint8_t *mbskip_table;
@@ -148,31 +124,6 @@ typedef struct Picture{
*/
void *hwaccel_picture_private;
-#define MB_TYPE_INTRA MB_TYPE_INTRA4x4 //default mb_type if there is just one
type
-#define IS_INTRA4x4(a) ((a)&MB_TYPE_INTRA4x4)
-#define IS_INTRA16x16(a) ((a)&MB_TYPE_INTRA16x16)
-#define IS_PCM(a) ((a)&MB_TYPE_INTRA_PCM)
-#define IS_INTRA(a) ((a)&7)
-#define IS_INTER(a)
((a)&(MB_TYPE_16x16|MB_TYPE_16x8|MB_TYPE_8x16|MB_TYPE_8x8))
-#define IS_SKIP(a) ((a)&MB_TYPE_SKIP)
-#define IS_INTRA_PCM(a) ((a)&MB_TYPE_INTRA_PCM)
-#define IS_INTERLACED(a) ((a)&MB_TYPE_INTERLACED)
-#define IS_DIRECT(a) ((a)&MB_TYPE_DIRECT2)
-#define IS_GMC(a) ((a)&MB_TYPE_GMC)
-#define IS_16X16(a) ((a)&MB_TYPE_16x16)
-#define IS_16X8(a) ((a)&MB_TYPE_16x8)
-#define IS_8X16(a) ((a)&MB_TYPE_8x16)
-#define IS_8X8(a) ((a)&MB_TYPE_8x8)
-#define IS_SUB_8X8(a) ((a)&MB_TYPE_16x16) //note reused
-#define IS_SUB_8X4(a) ((a)&MB_TYPE_16x8) //note reused
-#define IS_SUB_4X8(a) ((a)&MB_TYPE_8x16) //note reused
-#define IS_SUB_4X4(a) ((a)&MB_TYPE_8x8) //note reused
-#define IS_ACPRED(a) ((a)&MB_TYPE_ACPRED)
-#define IS_QUANT(a) ((a)&MB_TYPE_QUANT)
-#define IS_DIR(a, part, list) ((a) & (MB_TYPE_P0L0<<((part)+2*(list))))
-#define USES_LIST(a, list) ((a) & ((MB_TYPE_P0L0|MB_TYPE_P1L0)<<(2*(list))))
///< does this mb use listX, note does not work if subMBs
-#define HAS_CBP(a) ((a)&MB_TYPE_CBP)
-
int field_poc[2]; ///< h264 top/bottom POC
int poc; ///< h264 frame POC
int frame_num; ///< h264 frame_num (raw frame_num from slice
header)
diff --git a/libavcodec/mpegvideo_motion.c b/libavcodec/mpegvideo_motion.c
index ce7bffb..a186092 100644
--- a/libavcodec/mpegvideo_motion.c
+++ b/libavcodec/mpegvideo_motion.c
@@ -28,6 +28,7 @@
#include "dsputil.h"
#include "h261.h"
#include "mpegvideo.h"
+#include "mbtype.h"
#include "mjpegenc.h"
#include "msmpeg4.h"
#include "picttype.h"
diff --git a/libavcodec/msmpeg4dec.c b/libavcodec/msmpeg4dec.c
index 9a12633..e835226 100644
--- a/libavcodec/msmpeg4dec.c
+++ b/libavcodec/msmpeg4dec.c
@@ -24,6 +24,7 @@
#include "avcodec.h"
#include "dsputil.h"
+#include "mbtype.h"
#include "mpegvideo.h"
#include "msmpeg4.h"
#include "libavutil/x86/asm.h"
diff --git a/libavcodec/rv30.c b/libavcodec/rv30.c
index 82ad7d4..3b69d2d 100644
--- a/libavcodec/rv30.c
+++ b/libavcodec/rv30.c
@@ -25,6 +25,7 @@
*/
#include "avcodec.h"
+#include "mbtype.h"
#include "mpegvideo.h"
#include "golomb.h"
diff --git a/libavcodec/rv34.c b/libavcodec/rv34.c
index bff3c09..e6601c4 100644
--- a/libavcodec/rv34.c
+++ b/libavcodec/rv34.c
@@ -28,6 +28,7 @@
#include "avcodec.h"
#include "error_resilience.h"
+#include "mbtype.h"
#include "mpegvideo.h"
#include "golomb.h"
#include "internal.h"
diff --git a/libavcodec/rv40.c b/libavcodec/rv40.c
index def3990..5351a1b 100644
--- a/libavcodec/rv40.c
+++ b/libavcodec/rv40.c
@@ -27,6 +27,7 @@
#include "libavutil/imgutils.h"
#include "avcodec.h"
+#include "mbtype.h"
#include "mpegvideo.h"
#include "golomb.h"
diff --git a/libavcodec/vc1dec.c b/libavcodec/vc1dec.c
index 403cbbc..0b42466 100644
--- a/libavcodec/vc1dec.c
+++ b/libavcodec/vc1dec.c
@@ -29,6 +29,7 @@
#include "internal.h"
#include "avcodec.h"
#include "error_resilience.h"
+#include "mbtype.h"
#include "mpegvideo.h"
#include "h263.h"
#include "h264chroma.h"
diff --git a/libavcodec/wmv2dec.c b/libavcodec/wmv2dec.c
index 740636c..47fe9af 100644
--- a/libavcodec/wmv2dec.c
+++ b/libavcodec/wmv2dec.c
@@ -22,6 +22,7 @@
#include "mpegvideo.h"
#include "h263.h"
#include "mathops.h"
+#include "mbtype.h"
#include "msmpeg4.h"
#include "msmpeg4data.h"
#include "intrax8.h"
--
1.8.3.4 (Apple Git-47)
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
