Mercurial > libavformat.hg

comparison mm.c @ 2273:7eb456c4ed8a libavformat

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Replace all occurrences of AVERROR_NOMEM with AVERROR(ENOMEM).
author takis
date Thu, 19 Jul 2007 15:21:30 +0000
parents 06083249909c
children b21c2af60bc9
comparison
equal deleted inserted replaced
2272:8963d9ed1859 2273:7eb456c4ed8a
93 url_fseek(pb, length - 10, SEEK_CUR); /* unknown data */ 93 url_fseek(pb, length - 10, SEEK_CUR); /* unknown data */
94 94
95 /* video stream */ 95 /* video stream */
96 st = av_new_stream(s, 0); 96 st = av_new_stream(s, 0);
97 if (!st) 97 if (!st)
98 return AVERROR_NOMEM; 98 return AVERROR(ENOMEM);
99 st->codec->codec_type = CODEC_TYPE_VIDEO; 99 st->codec->codec_type = CODEC_TYPE_VIDEO;
100 st->codec->codec_id = CODEC_ID_MMVIDEO; 100 st->codec->codec_id = CODEC_ID_MMVIDEO;
101 st->codec->codec_tag = 0; /* no fourcc */ 101 st->codec->codec_tag = 0; /* no fourcc */
102 st->codec->width = width; 102 st->codec->width = width;
103 st->codec->height = height; 103 st->codec->height = height;
106 106
107 /* audio stream */ 107 /* audio stream */
108 if (length == MM_HEADER_LEN_AV) { 108 if (length == MM_HEADER_LEN_AV) {
109 st = av_new_stream(s, 0); 109 st = av_new_stream(s, 0);
110 if (!st) 110 if (!st)
111 return AVERROR_NOMEM; 111 return AVERROR(ENOMEM);
112 st->codec->codec_type = CODEC_TYPE_AUDIO; 112 st->codec->codec_type = CODEC_TYPE_AUDIO;
113 st->codec->codec_tag = 0; /* no fourcc */ 113 st->codec->codec_tag = 0; /* no fourcc */
114 st->codec->codec_id = CODEC_ID_PCM_U8; 114 st->codec->codec_id = CODEC_ID_PCM_U8;
115 st->codec->channels = 1; 115 st->codec->channels = 1;
116 st->codec->sample_rate = 8000; 116 st->codec->sample_rate = 8000;
166 case MM_TYPE_INTER_HH : 166 case MM_TYPE_INTER_HH :
167 case MM_TYPE_INTRA_HHV : 167 case MM_TYPE_INTRA_HHV :
168 case MM_TYPE_INTER_HHV : 168 case MM_TYPE_INTER_HHV :
169 /* output preamble + data */ 169 /* output preamble + data */
170 if (av_new_packet(pkt, length + MM_PREAMBLE_SIZE)) 170 if (av_new_packet(pkt, length + MM_PREAMBLE_SIZE))
171 return AVERROR_NOMEM; 171 return AVERROR(ENOMEM);
172 memcpy(pkt->data, preamble, MM_PREAMBLE_SIZE); 172 memcpy(pkt->data, preamble, MM_PREAMBLE_SIZE);
173 if (get_buffer(pb, pkt->data + MM_PREAMBLE_SIZE, length) != length) 173 if (get_buffer(pb, pkt->data + MM_PREAMBLE_SIZE, length) != length)
174 return AVERROR_IO; 174 return AVERROR_IO;
175 pkt->size = length + MM_PREAMBLE_SIZE; 175 pkt->size = length + MM_PREAMBLE_SIZE;
176 pkt->stream_index = 0; 176 pkt->stream_index = 0;
177 pkt->pts = mm->video_pts++; 177 pkt->pts = mm->video_pts++;
178 return 0; 178 return 0;
179 179
180 case MM_TYPE_AUDIO : 180 case MM_TYPE_AUDIO :
181 if (av_get_packet(&s->pb, pkt, length)<0) 181 if (av_get_packet(&s->pb, pkt, length)<0)
182 return AVERROR_NOMEM; 182 return AVERROR(ENOMEM);
183 pkt->size = length; 183 pkt->size = length;
184 pkt->stream_index = 1; 184 pkt->stream_index = 1;
185 pkt->pts = mm->audio_pts++; 185 pkt->pts = mm->audio_pts++;
186 return 0; 186 return 0;
187 187