Browse code

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

Reimar Döffinger authored on 2008/12/11 19:42:06
Showing 1 changed files
... ...
@@ -23,12 +23,12 @@
23 23
 #include "avformat.h"
24 24
 #include "gxf.h"
25 25
 
26
-typedef struct {
26
+struct gxf_stream_info {
27 27
     int64_t first_field;
28 28
     int64_t last_field;
29 29
     AVRational frames_per_second;
30 30
     int32_t fields_per_frame;
31
-} st_info_t;
31
+};
32 32
 
33 33
 /**
34 34
  * \brief parses a packet header, extracting type and length
... ...
@@ -157,7 +157,7 @@ static int get_sindex(AVFormatContext *s, int id, int format) {
157 157
  * \param len length of tag section, will be adjusted to contain remaining bytes
158 158
  * \param si struct to store collected information into
159 159
  */
160
-static void gxf_material_tags(ByteIOContext *pb, int *len, st_info_t *si) {
160
+static void gxf_material_tags(ByteIOContext *pb, int *len, struct gxf_stream_info *si) {
161 161
     si->first_field = AV_NOPTS_VALUE;
162 162
     si->last_field = AV_NOPTS_VALUE;
163 163
     while (*len >= 2) {
... ...
@@ -206,7 +206,7 @@ static AVRational fps_umf2avr(uint32_t flags) {
206 206
  * \param len length of tag section, will be adjusted to contain remaining bytes
207 207
  * \param si struct to store collected information into
208 208
  */
209
-static void gxf_track_tags(ByteIOContext *pb, int *len, st_info_t *si) {
209
+static void gxf_track_tags(ByteIOContext *pb, int *len, struct gxf_stream_info *si) {
210 210
     si->frames_per_second = (AVRational){0, 0};
211 211
     si->fields_per_frame = 0;
212 212
     while (*len >= 2) {
... ...
@@ -260,7 +260,7 @@ static int gxf_header(AVFormatContext *s, AVFormatParameters *ap) {
260 260
     int map_len;
261 261
     int len;
262 262
     AVRational main_timebase = {0, 0};
263
-    st_info_t si;
263
+    struct gxf_stream_info si;
264 264
     int i;
265 265
     if (!parse_packet_header(pb, &pkt_type, &map_len) || pkt_type != PKT_MAP) {
266 266
         av_log(s, AV_LOG_ERROR, "map packet not found\n");