[FFmpeg-soc] [soc]: r3195 - in mxf: mxf.h mxfdec.c mxfenc.c

[spyfeng]

Author: spyfeng
Date: Tue Aug 12 17:20:09 2008
New Revision: 3195

Log:
extract PRINT_KEY() from mxfenc.c/mxfdec.c to mxf.h


Modified:
   mxf/mxf.h
   mxf/mxfdec.c
   mxf/mxfenc.c

Modified: mxf/mxf.h
==============================================================================
--- mxf/mxf.h	(original)
+++ mxf/mxf.h	Tue Aug 12 17:20:09 2008
@@ -53,3 +53,7 @@ typedef struct {
     UID uid;
     enum CodecType type;
 } MXFDataDefinitionUL;
+
+#define PRINT_KEY(pc, s, x) dprintf(pc, "%s %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X\n", s, \
+                             (x)[0], (x)[1], (x)[2], (x)[3], (x)[4], (x)[5], (x)[6], (x)[7], (x)[8], (x)[9], (x)[10], (x)[11], (x)[12], (x)[13], (x)[14], (x)[15])
+

Modified: mxf/mxfdec.c
==============================================================================
--- mxf/mxfdec.c	(original)
+++ mxf/mxfdec.c	Tue Aug 12 17:20:09 2008
@@ -151,9 +151,6 @@ static const uint8_t mxf_sony_mpeg4_extr
 
 #define IS_KLV_KEY(x, y) (!memcmp(x, y, sizeof(y)))
 
-#define PRINT_KEY(pc, s, x) dprintf(pc, "%s %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X\n", s, \
-                             (x)[0], (x)[1], (x)[2], (x)[3], (x)[4], (x)[5], (x)[6], (x)[7], (x)[8], (x)[9], (x)[10], (x)[11], (x)[12], (x)[13], (x)[14], (x)[15])
-
 static int64_t klv_decode_ber_length(ByteIOContext *pb)
 {
     uint64_t size = get_byte(pb);

Modified: mxf/mxfenc.c
==============================================================================
--- mxf/mxfenc.c	(original)
+++ mxf/mxfenc.c	Tue Aug 12 17:20:09 2008
@@ -204,8 +204,6 @@ static const MXFLocalTagPair mxf_local_t
     { 0x3D06, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x02,0x04,0x01,0x06,0x01,0x00,0x00,0x00,0x00}}, /* sound essence compression */
 };
 
-#define PRINT_KEY(pc, s, x) dprintf(pc, "%s %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X\n", s, \
-                             (x)[0], (x)[1], (x)[2], (x)[3], (x)[4], (x)[5], (x)[6], (x)[7], (x)[8], (x)[9], (x)[10], (x)[11], (x)[12], (x)[13], (x)[14], (x)[15])
 static void mxf_generate_uuid(AVFormatContext *s, UID uuid)
 {
     MXFContext *mxf = s->priv_data;