Commit ab2268a2 authored by reimar's avatar reimar

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.


git-svn-id: file:///var/local/repositories/ffmpeg/trunk@16054 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent 52c306b1
...@@ -23,12 +23,12 @@ ...@@ -23,12 +23,12 @@
#include "avformat.h" #include "avformat.h"
#include "gxf.h" #include "gxf.h"
typedef struct { struct gxf_stream_info {
int64_t first_field; int64_t first_field;
int64_t last_field; int64_t last_field;
AVRational frames_per_second; AVRational frames_per_second;
int32_t fields_per_frame; int32_t fields_per_frame;
} st_info_t; };
/** /**
* \brief parses a packet header, extracting type and length * \brief parses a packet header, extracting type and length
...@@ -157,7 +157,7 @@ static int get_sindex(AVFormatContext *s, int id, int format) { ...@@ -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 len length of tag section, will be adjusted to contain remaining bytes
* \param si struct to store collected information into * \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->first_field = AV_NOPTS_VALUE;
si->last_field = AV_NOPTS_VALUE; si->last_field = AV_NOPTS_VALUE;
while (*len >= 2) { while (*len >= 2) {
...@@ -206,7 +206,7 @@ static AVRational fps_umf2avr(uint32_t flags) { ...@@ -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 len length of tag section, will be adjusted to contain remaining bytes
* \param si struct to store collected information into * \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->frames_per_second = (AVRational){0, 0};
si->fields_per_frame = 0; si->fields_per_frame = 0;
while (*len >= 2) { while (*len >= 2) {
...@@ -260,7 +260,7 @@ static int gxf_header(AVFormatContext *s, AVFormatParameters *ap) { ...@@ -260,7 +260,7 @@ static int gxf_header(AVFormatContext *s, AVFormatParameters *ap) {
int map_len; int map_len;
int len; int len;
AVRational main_timebase = {0, 0}; AVRational main_timebase = {0, 0};
st_info_t si; struct gxf_stream_info si;
int i; int i;
if (!parse_packet_header(pb, &pkt_type, &map_len) || pkt_type != PKT_MAP) { if (!parse_packet_header(pb, &pkt_type, &map_len) || pkt_type != PKT_MAP) {
av_log(s, AV_LOG_ERROR, "map packet not found\n"); av_log(s, AV_LOG_ERROR, "map packet not found\n");
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment