[SCM] libav/experimental: indentation
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Sun Jun 30 16:15:33 UTC 2013
The following commit has been merged in the experimental branch:
commit 54d8fd20fd6839db9584635f001ca2f8e4da3826
Author: Baptiste Coudurier <baptiste.coudurier at gmail.com>
Date: Mon Feb 25 12:23:27 2008 +0000
indentation
Originally committed as revision 12202 to svn://svn.ffmpeg.org/ffmpeg/trunk
diff --git a/libavformat/aiff.c b/libavformat/aiff.c
index 027b28b..a068ad3 100644
--- a/libavformat/aiff.c
+++ b/libavformat/aiff.c
@@ -331,45 +331,45 @@ static int aiff_read_header(AVFormatContext *s,
filesize -= size + 8;
switch (tag) {
- case MKTAG('C', 'O', 'M', 'M'): /* Common chunk */
- /* Then for the complete header info */
- st->nb_frames = get_aiff_header (pb, st->codec, size, version);
- if (st->nb_frames < 0)
- return st->nb_frames;
- if (offset > 0) // COMM is after SSND
- goto got_sound;
- break;
- case MKTAG('F', 'V', 'E', 'R'): /* Version chunk */
- version = get_be32(pb);
- break;
- case MKTAG('N', 'A', 'M', 'E'): /* Sample name chunk */
- get_meta (pb, s->title, sizeof(s->title), size);
- break;
- case MKTAG('A', 'U', 'T', 'H'): /* Author chunk */
- get_meta (pb, s->author, sizeof(s->author), size);
- break;
- case MKTAG('(', 'c', ')', ' '): /* Copyright chunk */
- get_meta (pb, s->copyright, sizeof(s->copyright), size);
- break;
- case MKTAG('A', 'N', 'N', 'O'): /* Annotation chunk */
- get_meta (pb, s->comment, sizeof(s->comment), size);
- break;
- case MKTAG('S', 'S', 'N', 'D'): /* Sampled sound chunk */
- offset = get_be32(pb); /* Offset of sound data */
- get_be32(pb); /* BlockSize... don't care */
- offset += url_ftell(pb); /* Compute absolute data offset */
- if (st->codec->codec_id) /* Assume COMM already parsed */
- goto got_sound;
- if (url_is_streamed(pb)) {
- av_log(s, AV_LOG_ERROR, "file is not seekable\n");
- return -1;
- }
- url_fskip(pb, size - 8);
- break;
- default: /* Jump */
- if (size & 1) /* Always even aligned */
- size++;
- url_fskip (pb, size);
+ case MKTAG('C', 'O', 'M', 'M'): /* Common chunk */
+ /* Then for the complete header info */
+ st->nb_frames = get_aiff_header (pb, st->codec, size, version);
+ if (st->nb_frames < 0)
+ return st->nb_frames;
+ if (offset > 0) // COMM is after SSND
+ goto got_sound;
+ break;
+ case MKTAG('F', 'V', 'E', 'R'): /* Version chunk */
+ version = get_be32(pb);
+ break;
+ case MKTAG('N', 'A', 'M', 'E'): /* Sample name chunk */
+ get_meta (pb, s->title, sizeof(s->title), size);
+ break;
+ case MKTAG('A', 'U', 'T', 'H'): /* Author chunk */
+ get_meta (pb, s->author, sizeof(s->author), size);
+ break;
+ case MKTAG('(', 'c', ')', ' '): /* Copyright chunk */
+ get_meta (pb, s->copyright, sizeof(s->copyright), size);
+ break;
+ case MKTAG('A', 'N', 'N', 'O'): /* Annotation chunk */
+ get_meta (pb, s->comment, sizeof(s->comment), size);
+ break;
+ case MKTAG('S', 'S', 'N', 'D'): /* Sampled sound chunk */
+ offset = get_be32(pb); /* Offset of sound data */
+ get_be32(pb); /* BlockSize... don't care */
+ offset += url_ftell(pb); /* Compute absolute data offset */
+ if (st->codec->codec_id) /* Assume COMM already parsed */
+ goto got_sound;
+ if (url_is_streamed(pb)) {
+ av_log(s, AV_LOG_ERROR, "file is not seekable\n");
+ return -1;
+ }
+ url_fskip(pb, size - 8);
+ break;
+ default: /* Jump */
+ if (size & 1) /* Always even aligned */
+ size++;
+ url_fskip (pb, size);
}
}
--
Libav/FFmpeg packaging
More information about the pkg-multimedia-commits
mailing list