Make ff_mxf_pixel_layouts static to mxf.c.

Also make it an anonymous structure as never it is accessed by name.

Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>

diff --git a/libavformat/mxf.c b/libavformat/mxf.c
index c7423b0b625a98a91c71b0d5307f6f6b516e3ee4..643a95243ad0fcce5b4aa15b9ab269d9441448e8 100644 (file)
--- a/libavformat/mxf.c
+++ b/libavformat/mxf.c
@@ -52,7 +52,10 @@ const MXFCodecUL ff_mxf_codec_uls[] = {
     { { 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 },  0,       CODEC_ID_NONE },
 };
 
-const MXFPixelLayout ff_mxf_pixel_layouts[] = {
+static const struct {
+    enum PixelFormat pix_fmt;
+    const char data[16];
+} ff_mxf_pixel_layouts[] = {
     /**
      * See SMPTE 377M E.2.46
      *

diff --git a/libavformat/mxf.h b/libavformat/mxf.h
index 11bd8772a8af668a66663fb9ff8a6152afb0531d..9190da6e049cb8b4b3dafffdd48e15f38f8d7eb6 100644 (file)
--- a/libavformat/mxf.h
+++ b/libavformat/mxf.h
@@ -61,13 +61,6 @@ typedef struct {
 extern const MXFCodecUL ff_mxf_data_definition_uls[];
 extern const MXFCodecUL ff_mxf_codec_uls[];
 
-typedef struct {
-    enum PixelFormat pix_fmt;
-    const char data[16];
-} MXFPixelLayout;
-
-extern const MXFPixelLayout ff_mxf_pixel_layouts[];
-
 int ff_mxf_decode_pixel_layout(const char pixel_layout[16], enum PixelFormat *pix_fmt);
 
 #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, \