har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Avoid _t in gxf enum type names

Browse Source 
Originally committed as revision 16112 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Reimar Döffinger 2008-12-13 21:58:17 +00:00
parent 1edddc99dc
commit d77ac324fe
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libavformat/gxf.c
View File

@ -37,7 +37,7 @@ struct gxf_stream_info {
* \param length detected packet length, excluding header is stored here * \param length detected packet length, excluding header is stored here
* \return 0 if header not found or contains invalid data, 1 otherwise * \return 0 if header not found or contains invalid data, 1 otherwise
*/ */
static int parse_packet_header(ByteIOContext *pb, pkt_type_t *type, int *length) { static int parse_packet_header(ByteIOContext *pb, GXFPktType *type, int *length) {
if (get_be32(pb)) if (get_be32(pb))
return 0; return 0;
if (get_byte(pb) != 1) if (get_byte(pb) != 1)
@ -161,7 +161,7 @@ static void gxf_material_tags(ByteIOContext *pb, int *len, struct gxf_stream_inf
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) {
mat_tag_t tag = get_byte(pb); GXFMatTag tag = get_byte(pb);
int tlen = get_byte(pb); int tlen = get_byte(pb);
*len -= 2; *len -= 2;
if (tlen > *len) if (tlen > *len)
@ -210,7 +210,7 @@ static void gxf_track_tags(ByteIOContext *pb, int *len, struct gxf_stream_info *
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) {
track_tag_t tag = get_byte(pb); GXFTrackTag tag = get_byte(pb);
int tlen = get_byte(pb); int tlen = get_byte(pb);
*len -= 2; *len -= 2;
if (tlen > *len) if (tlen > *len)
@ -256,7 +256,7 @@ static void gxf_read_index(AVFormatContext *s, int pkt_len) {
static int gxf_header(AVFormatContext *s, AVFormatParameters *ap) { static int gxf_header(AVFormatContext *s, AVFormatParameters *ap) {
ByteIOContext *pb = s->pb; ByteIOContext *pb = s->pb;
pkt_type_t pkt_type; GXFPktType pkt_type;
int map_len; int map_len;
int len; int len;
AVRational main_timebase = {0, 0}; AVRational main_timebase = {0, 0};
@ -382,7 +382,7 @@ static int64_t gxf_resync_media(AVFormatContext *s, uint64_t max_interval, int t
int64_t cur_timestamp = AV_NOPTS_VALUE; int64_t cur_timestamp = AV_NOPTS_VALUE;
int len; int len;
ByteIOContext *pb = s->pb; ByteIOContext *pb = s->pb;
pkt_type_t type; GXFPktType type;
tmp = get_be32(pb); tmp = get_be32(pb);
start: start:
while (tmp) while (tmp)
@ -412,7 +412,7 @@ out:
static int gxf_packet(AVFormatContext *s, AVPacket *pkt) { static int gxf_packet(AVFormatContext *s, AVPacket *pkt) {
ByteIOContext *pb = s->pb; ByteIOContext *pb = s->pb;
pkt_type_t pkt_type; GXFPktType pkt_type;
int pkt_len; int pkt_len;
while (!url_feof(pb)) { while (!url_feof(pb)) {
AVStream *st; AVStream *st;

6
libavformat/gxf.h
View File

@ -28,7 +28,7 @@ typedef enum {
PKT_EOS = 0xfb, PKT_EOS = 0xfb,
PKT_FLT = 0xfc, PKT_FLT = 0xfc,
PKT_UMF = 0xfd, PKT_UMF = 0xfd,
} pkt_type_t; } GXFPktType;
typedef enum { typedef enum {
MAT_NAME = 0x40, MAT_NAME = 0x40,
@ -37,7 +37,7 @@ typedef enum {
MAT_MARK_IN = 0x43, MAT_MARK_IN = 0x43,
MAT_MARK_OUT = 0x44, MAT_MARK_OUT = 0x44,
MAT_SIZE = 0x45, MAT_SIZE = 0x45,
} mat_tag_t; } GXFMatTag;
typedef enum { typedef enum {
TRACK_NAME = 0x4c, TRACK_NAME = 0x4c,
@ -47,6 +47,6 @@ typedef enum {
TRACK_FPS = 0x50, TRACK_FPS = 0x50,
TRACK_LINES = 0x51, TRACK_LINES = 0x51,
TRACK_FPF = 0x52, TRACK_FPF = 0x52,
} track_tag_t; } GXFTrackTag;
#endif /* AVFORMAT_GXF_H */ #endif /* AVFORMAT_GXF_H */

2
libavformat/gxfenc.c
View File

@ -155,7 +155,7 @@ static int64_t updateSize(ByteIOContext *pb, int64_t pos)
return curpos - pos; return curpos - pos;
} }
static void gxf_write_packet_header(ByteIOContext *pb, pkt_type_t type) static void gxf_write_packet_header(ByteIOContext *pb, GXFPktType type)
{ {
put_be32(pb, 0); /* packet leader for synchro */ put_be32(pb, 0); /* packet leader for synchro */
put_byte(pb, 1); put_byte(pb, 1);