Skip to content

F
ffmpeg-mt
Commit 0e82707d authored by bcoudurier's avatar bcoudurier
Browse files
Options

indentation 

git-svn-id: file:///var/local/repositories/ffmpeg/trunk@12202 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent 74cafb3e
Hide whitespace changes
Inline Side-by-side
Showing with 39 additions and 39 deletions
libavformat/aiff.c
View file @ 0e82707d
...@@ -331,45 +331,45 @@ static int aiff_read_header(AVFormatContext *s, ...@@ -331,45 +331,45 @@ static int aiff_read_header(AVFormatContext *s,
filesize -= size + 8; filesize -= size + 8;
switch (tag) { switch (tag) {
case MKTAG('C', 'O', 'M', 'M'): /* Common chunk */ case MKTAG('C', 'O', 'M', 'M'): /* Common chunk */
/* Then for the complete header info */ /* Then for the complete header info */
st->nb_frames = get_aiff_header (pb, st->codec, size, version); st->nb_frames = get_aiff_header (pb, st->codec, size, version);
if (st->nb_frames < 0) if (st->nb_frames < 0)
return st->nb_frames; return st->nb_frames;
if (offset > 0) // COMM is after SSND if (offset > 0) // COMM is after SSND
goto got_sound; goto got_sound;
break; break;
case MKTAG('F', 'V', 'E', 'R'): /* Version chunk */ case MKTAG('F', 'V', 'E', 'R'): /* Version chunk */
version = get_be32(pb); version = get_be32(pb);
break; break;
case MKTAG('N', 'A', 'M', 'E'): /* Sample name chunk */ case MKTAG('N', 'A', 'M', 'E'): /* Sample name chunk */
get_meta (pb, s->title, sizeof(s->title), size); get_meta (pb, s->title, sizeof(s->title), size);
break; break;
case MKTAG('A', 'U', 'T', 'H'): /* Author chunk */ case MKTAG('A', 'U', 'T', 'H'): /* Author chunk */
get_meta (pb, s->author, sizeof(s->author), size); get_meta (pb, s->author, sizeof(s->author), size);
break; break;
case MKTAG('(', 'c', ')', ' '): /* Copyright chunk */ case MKTAG('(', 'c', ')', ' '): /* Copyright chunk */
get_meta (pb, s->copyright, sizeof(s->copyright), size); get_meta (pb, s->copyright, sizeof(s->copyright), size);
break; break;
case MKTAG('A', 'N', 'N', 'O'): /* Annotation chunk */ case MKTAG('A', 'N', 'N', 'O'): /* Annotation chunk */
get_meta (pb, s->comment, sizeof(s->comment), size); get_meta (pb, s->comment, sizeof(s->comment), size);
break; break;
case MKTAG('S', 'S', 'N', 'D'): /* Sampled sound chunk */ case MKTAG('S', 'S', 'N', 'D'): /* Sampled sound chunk */
offset = get_be32(pb); /* Offset of sound data */ offset = get_be32(pb); /* Offset of sound data */
get_be32(pb); /* BlockSize... don't care */ get_be32(pb); /* BlockSize... don't care */
offset += url_ftell(pb); /* Compute absolute data offset */ offset += url_ftell(pb); /* Compute absolute data offset */
if (st->codec->codec_id) /* Assume COMM already parsed */ if (st->codec->codec_id) /* Assume COMM already parsed */
goto got_sound; goto got_sound;
if (url_is_streamed(pb)) { if (url_is_streamed(pb)) {
av_log(s, AV_LOG_ERROR, "file is not seekable\n"); av_log(s, AV_LOG_ERROR, "file is not seekable\n");
return -1; return -1;
} }
url_fskip(pb, size - 8); url_fskip(pb, size - 8);
break; break;
default: /* Jump */ default: /* Jump */
if (size & 1) /* Always even aligned */ if (size & 1) /* Always even aligned */
size++; size++;
url_fskip (pb, size); url_fskip (pb, size);
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment