[FFmpeg-cvslog] Make ff_mxf_pixel_layouts static to mxf.c.

Diego Elio Pettenò git
Wed Jan 26 04:01:19 CET 2011


ffmpeg | branch: master | Diego Elio Petten? <flameeyes at gmail.com> | Tue Jan 25 02:29:37 2011 +0100| [c940ed42540649f8a0c89888d0e9352f38f0a8b3] | committer: Michael Niedermayer

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 at jannau.net>
(cherry picked from commit a3dffc0627dfd85f8b1a72b9b637938dfa197208)

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c940ed42540649f8a0c89888d0e9352f38f0a8b3
---

 libavformat/mxf.c |    5 ++++-
 libavformat/mxf.h |    7 -------
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/libavformat/mxf.c b/libavformat/mxf.c
index c7423b0..643a952 100644
--- 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 11bd877..9190da6 100644
--- 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, \




More information about the ffmpeg-cvslog mailing list