From 4e5b854e4ceefffdc34366ff39532c2804fbf1ce Mon Sep 17 00:00:00 2001 From: Reimar Döffinger Date: Thu, 11 Dec 2008 10:42:06 +0000 Subject: Use "struct gxf_stream_info" instead of "st_info_t", avoids a typedef that is not really worth it and the reserved POSIX _t namespace. Originally committed as revision 16054 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavformat/gxf.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'libavformat/gxf.c') diff --git a/libavformat/gxf.c b/libavformat/gxf.c index 5bbac82bb0..bbf0a604d9 100644 --- a/libavformat/gxf.c +++ b/libavformat/gxf.c @@ -23,12 +23,12 @@ #include "avformat.h" #include "gxf.h" -typedef struct { +struct gxf_stream_info { int64_t first_field; int64_t last_field; AVRational frames_per_second; int32_t fields_per_frame; -} st_info_t; +}; /** * \brief parses a packet header, extracting type and length @@ -157,7 +157,7 @@ static int get_sindex(AVFormatContext *s, int id, int format) { * \param len length of tag section, will be adjusted to contain remaining bytes * \param si struct to store collected information into */ -static void gxf_material_tags(ByteIOContext *pb, int *len, st_info_t *si) { +static void gxf_material_tags(ByteIOContext *pb, int *len, struct gxf_stream_info *si) { si->first_field = AV_NOPTS_VALUE; si->last_field = AV_NOPTS_VALUE; while (*len >= 2) { @@ -206,7 +206,7 @@ static AVRational fps_umf2avr(uint32_t flags) { * \param len length of tag section, will be adjusted to contain remaining bytes * \param si struct to store collected information into */ -static void gxf_track_tags(ByteIOContext *pb, int *len, st_info_t *si) { +static void gxf_track_tags(ByteIOContext *pb, int *len, struct gxf_stream_info *si) { si->frames_per_second = (AVRational){0, 0}; si->fields_per_frame = 0; while (*len >= 2) { @@ -260,7 +260,7 @@ static int gxf_header(AVFormatContext *s, AVFormatParameters *ap) { int map_len; int len; AVRational main_timebase = {0, 0}; - st_info_t si; + struct gxf_stream_info si; int i; if (!parse_packet_header(pb, &pkt_type, &map_len) || pkt_type != PKT_MAP) { av_log(s, AV_LOG_ERROR, "map packet not found\n"); -- cgit v1.2.3