comparison yuv4mpeg.c @ 482:0fdc96c2f2fe libavformat

sweeping change from -EIO -> AVERROR_IO
author melanson
date Sat, 19 Jun 2004 03:59:34 +0000
parents 60f897e8dd2d
children 558a093b04db
comparison
equal deleted inserted replaced
481:f1430abbbd8b 482:0fdc96c2f2fe
75 /* for the first packet we have to output the header as well */ 75 /* for the first packet we have to output the header as well */
76 if (*first_pkt) { 76 if (*first_pkt) {
77 *first_pkt = 0; 77 *first_pkt = 0;
78 if (yuv4_generate_header(s, buf2) < 0) { 78 if (yuv4_generate_header(s, buf2) < 0) {
79 av_log(s, AV_LOG_ERROR, "Error. YUV4MPEG stream header write failed.\n"); 79 av_log(s, AV_LOG_ERROR, "Error. YUV4MPEG stream header write failed.\n");
80 return -EIO; 80 return AVERROR_IO;
81 } else { 81 } else {
82 put_buffer(pb, buf2, strlen(buf2)); 82 put_buffer(pb, buf2, strlen(buf2));
83 } 83 }
84 } 84 }
85 85
116 static int yuv4_write_header(AVFormatContext *s) 116 static int yuv4_write_header(AVFormatContext *s)
117 { 117 {
118 int* first_pkt = s->priv_data; 118 int* first_pkt = s->priv_data;
119 119
120 if (s->nb_streams != 1) 120 if (s->nb_streams != 1)
121 return -EIO; 121 return AVERROR_IO;
122 122
123 if (s->streams[0]->codec.pix_fmt == PIX_FMT_YUV411P) { 123 if (s->streams[0]->codec.pix_fmt == PIX_FMT_YUV411P) {
124 av_log(s, AV_LOG_ERROR, "Warning: generating non-standard 4:1:1 YUV stream, some mjpegtools might not work.\n"); 124 av_log(s, AV_LOG_ERROR, "Warning: generating non-standard 4:1:1 YUV stream, some mjpegtools might not work.\n");
125 } 125 }
126 else if (s->streams[0]->codec.pix_fmt != PIX_FMT_YUV420P) { 126 else if (s->streams[0]->codec.pix_fmt != PIX_FMT_YUV420P) {
127 av_log(s, AV_LOG_ERROR, "ERROR: yuv4mpeg only handles 4:2:0, 4:1:1 YUV data. Use -pix_fmt to select one.\n"); 127 av_log(s, AV_LOG_ERROR, "ERROR: yuv4mpeg only handles 4:2:0, 4:1:1 YUV data. Use -pix_fmt to select one.\n");
128 return -EIO; 128 return AVERROR_IO;
129 } 129 }
130 130
131 *first_pkt = 1; 131 *first_pkt = 1;
132 return 0; 132 return 0;
133 } 133 }
215 packet_size = avpicture_get_size(st->codec.pix_fmt, width, height); 215 packet_size = avpicture_get_size(st->codec.pix_fmt, width, height);
216 if (packet_size < 0) 216 if (packet_size < 0)
217 av_abort(); 217 av_abort();
218 218
219 if (av_new_packet(pkt, packet_size) < 0) 219 if (av_new_packet(pkt, packet_size) < 0)
220 return -EIO; 220 return AVERROR_IO;
221 221
222 pkt->stream_index = 0; 222 pkt->stream_index = 0;
223 ret = get_buffer(&s->pb, pkt->data, pkt->size); 223 ret = get_buffer(&s->pb, pkt->data, pkt->size);
224 if (ret != pkt->size) { 224 if (ret != pkt->size) {
225 av_free_packet(pkt); 225 av_free_packet(pkt);
226 return -EIO; 226 return AVERROR_IO;
227 } else { 227 } else {
228 return 0; 228 return 0;
229 } 229 }
230 } 230 }
231 231