Mercurial > libavformat.hg
changeset 3939:20da3b0e6adf libavformat
cosmetics, remove GXF: in log messages since it is present in context
| author | bcoudurier |
|---|---|
| date | Wed, 24 Sep 2008 23:40:55 +0000 |
| parents | aaae317c3d54 |
| children | 77f3d0224ee9 |
| files | gxf.c |
| diffstat | 1 files changed, 15 insertions(+), 15 deletions(-) [+] |
line wrap: on
line diff
--- a/gxf.c Wed Sep 24 23:31:04 2008 +0000 +++ b/gxf.c Wed Sep 24 23:40:55 2008 +0000 @@ -238,11 +238,11 @@ int i; pkt_len -= 8; if (map_cnt > 1000) { - av_log(s, AV_LOG_ERROR, "GXF: too many index entries %u (%x)\n", map_cnt, map_cnt); + av_log(s, AV_LOG_ERROR, "too many index entries %u (%x)\n", map_cnt, map_cnt); map_cnt = 1000; } if (pkt_len < 4 * map_cnt) { - av_log(s, AV_LOG_ERROR, "GXF: invalid index length\n"); + av_log(s, AV_LOG_ERROR, "invalid index length\n"); url_fskip(pb, pkt_len); return; } @@ -263,18 +263,18 @@ st_info_t si; int i; if (!parse_packet_header(pb, &pkt_type, &map_len) || pkt_type != PKT_MAP) { - av_log(s, AV_LOG_ERROR, "GXF: map packet not found\n"); + av_log(s, AV_LOG_ERROR, "map packet not found\n"); return 0; } map_len -= 2; if (get_byte(pb) != 0x0e0 || get_byte(pb) != 0xff) { - av_log(s, AV_LOG_ERROR, "GXF: unknown version or invalid map preamble\n"); + av_log(s, AV_LOG_ERROR, "unknown version or invalid map preamble\n"); return 0; } map_len -= 2; len = get_be16(pb); // length of material data section if (len > map_len) { - av_log(s, AV_LOG_ERROR, "GXF: material data longer than map data\n"); + av_log(s, AV_LOG_ERROR, "material data longer than map data\n"); return 0; } map_len -= len; @@ -283,7 +283,7 @@ map_len -= 2; len = get_be16(pb); // length of track description if (len > map_len) { - av_log(s, AV_LOG_ERROR, "GXF: track description longer than map data\n"); + av_log(s, AV_LOG_ERROR, "track description longer than map data\n"); return 0; } map_len -= len; @@ -299,12 +299,12 @@ gxf_track_tags(pb, &track_len, &si); url_fskip(pb, track_len); if (!(track_type & 0x80)) { - av_log(s, AV_LOG_ERROR, "GXF: invalid track type %x\n", track_type); + av_log(s, AV_LOG_ERROR, "invalid track type %x\n", track_type); continue; } track_type &= 0x7f; if ((track_id & 0xc0) != 0xc0) { - av_log(s, AV_LOG_ERROR, "GXF: invalid track id %x\n", track_id); + av_log(s, AV_LOG_ERROR, "invalid track id %x\n", track_id); continue; } track_id &= 0x3f; @@ -320,17 +320,17 @@ st->duration = si.last_field - si.first_field; } if (len < 0) - av_log(s, AV_LOG_ERROR, "GXF: invalid track description length specified\n"); + av_log(s, AV_LOG_ERROR, "invalid track description length specified\n"); if (map_len) url_fskip(pb, map_len); if (!parse_packet_header(pb, &pkt_type, &len)) { - av_log(s, AV_LOG_ERROR, "GXF: sync lost in header\n"); + av_log(s, AV_LOG_ERROR, "sync lost in header\n"); return -1; } if (pkt_type == PKT_FLT) { gxf_read_index(s, len); if (!parse_packet_header(pb, &pkt_type, &len)) { - av_log(s, AV_LOG_ERROR, "GXF: sync lost in header\n"); + av_log(s, AV_LOG_ERROR, "sync lost in header\n"); return -1; } } @@ -347,9 +347,9 @@ main_timebase.den = fps.num; } } else - av_log(s, AV_LOG_INFO, "GXF: UMF packet too short\n"); + av_log(s, AV_LOG_INFO, "UMF packet too short\n"); } else - av_log(s, AV_LOG_INFO, "GXF: UMF packet missing\n"); + av_log(s, AV_LOG_INFO, "UMF packet missing\n"); url_fskip(pb, len); if (!main_timebase.num || !main_timebase.den) main_timebase = (AVRational){1, 50}; // set some arbitrary fallback @@ -421,7 +421,7 @@ int stream_index; if (!parse_packet_header(pb, &pkt_type, &pkt_len)) { if (!url_feof(pb)) - av_log(s, AV_LOG_ERROR, "GXF: sync lost\n"); + av_log(s, AV_LOG_ERROR, "sync lost\n"); return -1; } if (pkt_type == PKT_FLT) { @@ -433,7 +433,7 @@ continue; } if (pkt_len < 16) { - av_log(s, AV_LOG_ERROR, "GXF: invalid media packet length\n"); + av_log(s, AV_LOG_ERROR, "invalid media packet length\n"); continue; } pkt_len -= 16;