Mercurial > libavformat.hg
comparison iff.c @ 6261:7d8e6562ce1a libavformat
remove redundant text and whitespaces from iff demuxer av_log() statements
| author | pross |
|---|---|
| date | Thu, 15 Jul 2010 11:43:09 +0000 |
| parents | 5b6f32f1546f |
| children |
comparison
equal
deleted
inserted
replaced
| 6260:5c17c20dd67a | 6261:7d8e6562ce1a |
|---|---|
| 218 break; | 218 break; |
| 219 } | 219 } |
| 220 | 220 |
| 221 if (metadata_tag) { | 221 if (metadata_tag) { |
| 222 if ((res = get_metadata(s, metadata_tag, data_size)) < 0) { | 222 if ((res = get_metadata(s, metadata_tag, data_size)) < 0) { |
| 223 av_log(s, AV_LOG_ERROR, "iff: cannot allocate metadata tag %s!", metadata_tag); | 223 av_log(s, AV_LOG_ERROR, "cannot allocate metadata tag %s!", metadata_tag); |
| 224 return res; | 224 return res; |
| 225 } | 225 } |
| 226 } | 226 } |
| 227 url_fskip(pb, data_size - (url_ftell(pb) - orig_pos) + (data_size & 1)); | 227 url_fskip(pb, data_size - (url_ftell(pb) - orig_pos) + (data_size & 1)); |
| 228 } | 228 } |
| 242 break; | 242 break; |
| 243 case COMP_EXP: | 243 case COMP_EXP: |
| 244 st->codec->codec_id = CODEC_ID_8SVX_EXP; | 244 st->codec->codec_id = CODEC_ID_8SVX_EXP; |
| 245 break; | 245 break; |
| 246 default: | 246 default: |
| 247 av_log(s, AV_LOG_ERROR, "iff: unknown compression method\n"); | 247 av_log(s, AV_LOG_ERROR, "unknown compression method\n"); |
| 248 return -1; | 248 return -1; |
| 249 } | 249 } |
| 250 | 250 |
| 251 st->codec->bits_per_coded_sample = 8; | 251 st->codec->bits_per_coded_sample = 8; |
| 252 st->codec->bit_rate = st->codec->channels * st->codec->sample_rate * st->codec->bits_per_coded_sample; | 252 st->codec->bit_rate = st->codec->channels * st->codec->sample_rate * st->codec->bits_per_coded_sample; |
| 287 if(st->codec->channels == 2) { | 287 if(st->codec->channels == 2) { |
| 288 uint8_t sample_buffer[PACKET_SIZE]; | 288 uint8_t sample_buffer[PACKET_SIZE]; |
| 289 | 289 |
| 290 ret = get_buffer(pb, sample_buffer, PACKET_SIZE); | 290 ret = get_buffer(pb, sample_buffer, PACKET_SIZE); |
| 291 if(av_new_packet(pkt, PACKET_SIZE) < 0) { | 291 if(av_new_packet(pkt, PACKET_SIZE) < 0) { |
| 292 av_log(s, AV_LOG_ERROR, "iff: cannot allocate packet \n"); | 292 av_log(s, AV_LOG_ERROR, "cannot allocate packet\n"); |
| 293 return AVERROR(ENOMEM); | 293 return AVERROR(ENOMEM); |
| 294 } | 294 } |
| 295 interleave_stereo(sample_buffer, pkt->data, PACKET_SIZE); | 295 interleave_stereo(sample_buffer, pkt->data, PACKET_SIZE); |
| 296 } else if (st->codec->codec_type == AVMEDIA_TYPE_VIDEO) { | 296 } else if (st->codec->codec_type == AVMEDIA_TYPE_VIDEO) { |
| 297 ret = av_get_packet(pb, pkt, iff->body_size); | 297 ret = av_get_packet(pb, pkt, iff->body_size); |