diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2015-02-14 21:07:40 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2015-02-14 21:07:40 +0100 |
commit | a0fe1a25fa76809005cb90beb09e66cb7493b353 (patch) | |
tree | bdbcbe4b6ae9cfc43f4a614c2d85cef715abd483 /libavformat/mxfenc.c | |
parent | 4ab7eb0da2326ccc424f8fdd69ca31c61edc2eb5 (diff) | |
parent | daf8cf358a098a903d59adb6c0d0cc3262a8c93e (diff) | |
download | ffmpeg-streaming-a0fe1a25fa76809005cb90beb09e66cb7493b353.zip ffmpeg-streaming-a0fe1a25fa76809005cb90beb09e66cb7493b353.tar.gz |
Merge commit 'daf8cf358a098a903d59adb6c0d0cc3262a8c93e'
* commit 'daf8cf358a098a903d59adb6c0d0cc3262a8c93e':
avformat: Don't anonymously typedef structs
Conflicts:
libavformat/adtsenc.c
libavformat/aiffenc.c
libavformat/avidec.c
libavformat/gif.c
libavformat/iff.c
libavformat/img2dec.c
libavformat/jvdec.c
libavformat/matroskadec.c
libavformat/udp.c
libavformat/wtvdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/mxfenc.c')
-rw-r--r-- | libavformat/mxfenc.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libavformat/mxfenc.c b/libavformat/mxfenc.c index 17ad132..dfa647d 100644 --- a/libavformat/mxfenc.c +++ b/libavformat/mxfenc.c @@ -57,19 +57,19 @@ extern AVOutputFormat ff_mxf_opatom_muxer; #define EDIT_UNITS_PER_BODY 250 #define KAG_SIZE 512 -typedef struct { +typedef struct MXFLocalTagPair { int local_tag; UID uid; } MXFLocalTagPair; -typedef struct { +typedef struct MXFIndexEntry { uint8_t flags; uint64_t offset; unsigned slice_offset; ///< offset of audio slice uint16_t temporal_ref; } MXFIndexEntry; -typedef struct { +typedef struct MXFStreamContext { AudioInterleaveContext aic; UID track_essence_element_key; int index; ///< index in mxf_essence_container_uls table @@ -84,7 +84,7 @@ typedef struct { int video_bit_rate; } MXFStreamContext; -typedef struct { +typedef struct MXFContainerEssenceEntry { UID container_ul; UID element_ul; UID codec_ul; |