cosmetics: whitespace, prettyprinting, coding style fixes

Originally committed as revision 19618 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Diego Biurrun
2009-08-10 16:35:36 +00:00
parent 740e89cf83
commit c5e86106fb

View File

@ -217,9 +217,9 @@ static int w64_probe(AVProbeData *p)
if (p->buf_size <= 40) if (p->buf_size <= 40)
return 0; return 0;
if (!memcmp(p->buf, guid_riff, 16) && if (!memcmp(p->buf, guid_riff, 16) &&
!memcmp(p->buf + 24, guid_wave, 16)) { !memcmp(p->buf + 24, guid_wave, 16))
return AVPROBE_SCORE_MAX; return AVPROBE_SCORE_MAX;
} else else
return 0; return 0;
} }
@ -310,13 +310,12 @@ static int wav_read_packet(AVFormatContext *s,
left = wav->data_end - url_ftell(s->pb); left = wav->data_end - url_ftell(s->pb);
if (left <= 0){ if (left <= 0){
if (CONFIG_W64_DEMUXER && wav->w64) { if (CONFIG_W64_DEMUXER && wav->w64)
left = find_guid(s->pb, guid_data) - 24; left = find_guid(s->pb, guid_data) - 24;
} else else
left = find_tag(s->pb, MKTAG('d', 'a', 't', 'a')); left = find_tag(s->pb, MKTAG('d', 'a', 't', 'a'));
if (left < 0) { if (left < 0)
return AVERROR(EIO); return AVERROR(EIO);
}
wav->data_end= url_ftell(s->pb) + left; wav->data_end= url_ftell(s->pb) + left;
} }
@ -371,6 +370,7 @@ AVInputFormat wav_demuxer = {
.codec_tag= (const AVCodecTag* const []){ff_codec_wav_tags, 0}, .codec_tag= (const AVCodecTag* const []){ff_codec_wav_tags, 0},
}; };
#endif #endif
#if CONFIG_WAV_MUXER #if CONFIG_WAV_MUXER
AVOutputFormat wav_muxer = { AVOutputFormat wav_muxer = {
"wav", "wav",
@ -386,6 +386,7 @@ AVOutputFormat wav_muxer = {
.codec_tag= (const AVCodecTag* const []){ff_codec_wav_tags, 0}, .codec_tag= (const AVCodecTag* const []){ff_codec_wav_tags, 0},
}; };
#endif #endif
#if CONFIG_W64_DEMUXER #if CONFIG_W64_DEMUXER
AVInputFormat w64_demuxer = { AVInputFormat w64_demuxer = {
"w64", "w64",