Mercurial > libavformat.hg

comparison txd.c @ 4636:d4f4eb9ce54f libavformat

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add a context to av_log() calls.
author benoit
date Tue, 03 Mar 2009 16:19:37 +0000
parents 042e9a2fdda2
children cda7add41fbb
comparison
equal deleted inserted replaced
4635:158706fa656f 4636:d4f4eb9ce54f
62 marker = get_le32(pb); 62 marker = get_le32(pb);
63 63
64 if (url_feof(s->pb)) 64 if (url_feof(s->pb))
65 return AVERROR(EIO); 65 return AVERROR(EIO);
66 if (marker != TXD_MARKER && marker != TXD_MARKER2) { 66 if (marker != TXD_MARKER && marker != TXD_MARKER2) {
67 av_log(NULL, AV_LOG_ERROR, "marker does not match\n"); 67 av_log(s, AV_LOG_ERROR, "marker does not match\n");
68 return AVERROR(EIO); 68 return AVERROR(EIO);
69 } 69 }
70 70
71 switch (id) { 71 switch (id) {
72 case TXD_INFO: 72 case TXD_INFO:
76 url_fskip(s->pb, chunk_size); 76 url_fskip(s->pb, chunk_size);
77 case TXD_FILE: 77 case TXD_FILE:
78 case TXD_TEXTURE: 78 case TXD_TEXTURE:
79 goto next_chunk; 79 goto next_chunk;
80 default: 80 default:
81 av_log(NULL, AV_LOG_ERROR, "unknown chunk id %i\n", id); 81 av_log(s, AV_LOG_ERROR, "unknown chunk id %i\n", id);
82 return AVERROR(EIO); 82 return AVERROR(EIO);
83 } 83 }
84 84
85 ret = av_get_packet(s->pb, pkt, chunk_size); 85 ret = av_get_packet(s->pb, pkt, chunk_size);
86 pkt->stream_index = 0; 86 pkt->stream_index = 0;