[FFmpeg-cvslog] r16112 - in trunk/libavformat: gxf.c gxf.h gxfenc.c
reimar
subversion
Sat Dec 13 22:58:17 CET 2008
Author: reimar
Date: Sat Dec 13 22:58:17 2008
New Revision: 16112
Log:
Avoid _t in gxf enum type names
Modified:
trunk/libavformat/gxf.c
trunk/libavformat/gxf.h
trunk/libavformat/gxfenc.c
Modified: trunk/libavformat/gxf.c
==============================================================================
--- trunk/libavformat/gxf.c (original)
+++ trunk/libavformat/gxf.c Sat Dec 13 22:58:17 2008
@@ -37,7 +37,7 @@ struct gxf_stream_info {
* \param length detected packet length, excluding header is stored here
* \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))
return 0;
if (get_byte(pb) != 1)
@@ -161,7 +161,7 @@ static void gxf_material_tags(ByteIOCont
si->first_field = AV_NOPTS_VALUE;
si->last_field = AV_NOPTS_VALUE;
while (*len >= 2) {
- mat_tag_t tag = get_byte(pb);
+ GXFMatTag tag = get_byte(pb);
int tlen = get_byte(pb);
*len -= 2;
if (tlen > *len)
@@ -210,7 +210,7 @@ static void gxf_track_tags(ByteIOContext
si->frames_per_second = (AVRational){0, 0};
si->fields_per_frame = 0;
while (*len >= 2) {
- track_tag_t tag = get_byte(pb);
+ GXFTrackTag tag = get_byte(pb);
int tlen = get_byte(pb);
*len -= 2;
if (tlen > *len)
@@ -256,7 +256,7 @@ static void gxf_read_index(AVFormatConte
static int gxf_header(AVFormatContext *s, AVFormatParameters *ap) {
ByteIOContext *pb = s->pb;
- pkt_type_t pkt_type;
+ GXFPktType pkt_type;
int map_len;
int len;
AVRational main_timebase = {0, 0};
@@ -382,7 +382,7 @@ static int64_t gxf_resync_media(AVFormat
int64_t cur_timestamp = AV_NOPTS_VALUE;
int len;
ByteIOContext *pb = s->pb;
- pkt_type_t type;
+ GXFPktType type;
tmp = get_be32(pb);
start:
while (tmp)
@@ -412,7 +412,7 @@ out:
static int gxf_packet(AVFormatContext *s, AVPacket *pkt) {
ByteIOContext *pb = s->pb;
- pkt_type_t pkt_type;
+ GXFPktType pkt_type;
int pkt_len;
while (!url_feof(pb)) {
AVStream *st;
Modified: trunk/libavformat/gxf.h
==============================================================================
--- trunk/libavformat/gxf.h (original)
+++ trunk/libavformat/gxf.h Sat Dec 13 22:58:17 2008
@@ -28,7 +28,7 @@ typedef enum {
PKT_EOS = 0xfb,
PKT_FLT = 0xfc,
PKT_UMF = 0xfd,
-} pkt_type_t;
+} GXFPktType;
typedef enum {
MAT_NAME = 0x40,
@@ -37,7 +37,7 @@ typedef enum {
MAT_MARK_IN = 0x43,
MAT_MARK_OUT = 0x44,
MAT_SIZE = 0x45,
-} mat_tag_t;
+} GXFMatTag;
typedef enum {
TRACK_NAME = 0x4c,
@@ -47,6 +47,6 @@ typedef enum {
TRACK_FPS = 0x50,
TRACK_LINES = 0x51,
TRACK_FPF = 0x52,
-} track_tag_t;
+} GXFTrackTag;
#endif /* AVFORMAT_GXF_H */
Modified: trunk/libavformat/gxfenc.c
==============================================================================
--- trunk/libavformat/gxfenc.c (original)
+++ trunk/libavformat/gxfenc.c Sat Dec 13 22:58:17 2008
@@ -155,7 +155,7 @@ static int64_t updateSize(ByteIOContext
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_byte(pb, 1);
More information about the ffmpeg-cvslog
mailing list