diff options
| author | Diego Elio Pettenò <flameeyes@gmail.com> | 2011-01-25 02:29:37 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-01-26 03:43:32 +0100 |
| commit | c940ed42540649f8a0c89888d0e9352f38f0a8b3 (patch) | |
| tree | a9060aba7691289db7ecd38bb09abab975192821 | |
| parent | 123241214cebfc4e55789f611fc09dc253dca39a (diff) | |
| download | ffmpeg-c940ed42540649f8a0c89888d0e9352f38f0a8b3.tar.gz | |
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>
(cherry picked from commit a3dffc0627dfd85f8b1a72b9b637938dfa197208)
| -rw-r--r-- | libavformat/mxf.c | 5 | ||||
| -rw-r--r-- | libavformat/mxf.h | 7 |
2 files changed, 4 insertions, 8 deletions
diff --git a/libavformat/mxf.c b/libavformat/mxf.c index c7423b0b62..643a95243a 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 11bd8772a8..9190da6e04 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, \ |