Mercurial > libavformat.hg

comparison txd.c @ 2274:b21c2af60bc9 libavformat

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Replace all occurrences of AVERROR_IO with AVERROR(EIO).
author takis
date Thu, 19 Jul 2007 15:23:32 +0000
parents 7eb456c4ed8a
children d52c718e83f9
comparison
equal deleted inserted replaced
2273:7eb456c4ed8a 2274:b21c2af60bc9
59 id = get_le32(pb); 59 id = get_le32(pb);
60 chunk_size = get_le32(pb); 60 chunk_size = get_le32(pb);
61 marker = get_le32(pb); 61 marker = get_le32(pb);
62 62
63 if (url_feof(&s->pb)) 63 if (url_feof(&s->pb))
64 return AVERROR_IO; 64 return AVERROR(EIO);
65 if (marker != TXD_MARKER && marker != TXD_MARKER2) { 65 if (marker != TXD_MARKER && marker != TXD_MARKER2) {
66 av_log(NULL, AV_LOG_ERROR, "marker does not match\n"); 66 av_log(NULL, AV_LOG_ERROR, "marker does not match\n");
67 return AVERROR_IO; 67 return AVERROR(EIO);
68 } 68 }
69 69
70 switch (id) { 70 switch (id) {
71 case TXD_INFO: 71 case TXD_INFO:
72 if (chunk_size > 100) 72 if (chunk_size > 100)
76 case TXD_FILE: 76 case TXD_FILE:
77 case TXD_TEXTURE: 77 case TXD_TEXTURE:
78 goto next_chunk; 78 goto next_chunk;
79 default: 79 default:
80 av_log(NULL, AV_LOG_ERROR, "unknown chunk id %i\n", id); 80 av_log(NULL, AV_LOG_ERROR, "unknown chunk id %i\n", id);
81 return AVERROR_IO; 81 return AVERROR(EIO);
82 } 82 }
83 83
84 ret = av_get_packet(&s->pb, pkt, chunk_size); 84 ret = av_get_packet(&s->pb, pkt, chunk_size);
85 pkt->stream_index = 0; 85 pkt->stream_index = 0;
86 86
87 return ret <= 0 ? AVERROR_IO : ret; 87 return ret <= 0 ? AVERROR(EIO) : ret;
88 } 88 }
89 89
90 static int txd_read_close(AVFormatContext *s) { 90 static int txd_read_close(AVFormatContext *s) {
91 return 0; 91 return 0;
92 } 92 }