Merge commit 'a25d912dca9cd553440167e0476c47581359c0fc'

[ffmpeg] / libavformat / mxf.h

diff --git a/libavformat/mxf.h b/libavformat/mxf.h
index ed3225b769c4b57e2e5d268817d8a09db9e3b1d1..4c751e8eef8714b299b8fa88cf5b06c79a833527 100644 (file)
--- a/libavformat/mxf.h
+++ b/libavformat/mxf.h
@@ -55,13 +55,13 @@ enum MXFFrameLayout {
     SegmentedFrame,
 };
 
-typedef struct {
+typedef struct KLVPacket {
     UID key;
     int64_t offset;
     uint64_t length;
 } KLVPacket;
 
-typedef struct {
+typedef struct MXFCodecUL {
     UID uid;
     unsigned matching_len;
     int id;
@@ -76,7 +76,7 @@ extern const MXFCodecUL ff_mxf_data_definition_uls[];
 extern const MXFCodecUL ff_mxf_codec_uls[];
 extern const MXFCodecUL ff_mxf_pixel_format_uls[];
 
-int ff_mxf_decode_pixel_layout(const char pixel_layout[16], enum PixelFormat *pix_fmt);
+int ff_mxf_decode_pixel_layout(const char pixel_layout[16], enum AVPixelFormat *pix_fmt);
 const MXFSamplesPerFrame *ff_mxf_get_samples_per_frame(AVFormatContext *s, AVRational time_base);
 
 #define PRINT_KEY(pc, s, x) av_dlog(pc, "%s %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X\n", s, \