aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJustin Ruggles <justin.ruggles@gmail.com>2010-12-07 14:02:42 +0000
committerJustin Ruggles <justin.ruggles@gmail.com>2010-12-07 14:02:42 +0000
commited4e1e58332d3162881fea063615b6700b38bbb9 (patch)
tree208749d86b63d49914f2bbccc3d213a72e80af75
parent3c795698d074612375df710e60ad93597eca1f5c (diff)
downloadffmpeg-ed4e1e58332d3162881fea063615b6700b38bbb9.tar.gz
cosmetics: line wrap after last commit
Originally committed as revision 25913 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--libavcodec/flac.c21
1 files changed, 14 insertions, 7 deletions
diff --git a/libavcodec/flac.c b/libavcodec/flac.c
index 9ace821f25..484a44efb3 100644
--- a/libavcodec/flac.c
+++ b/libavcodec/flac.c
@@ -58,14 +58,16 @@ int ff_flac_decode_frame_header(AVCodecContext *avctx, GetBitContext *gb,
} else if (fi->ch_mode <= FLAC_CHMODE_MID_SIDE) {
fi->channels = 2;
} else {
- av_log(avctx, AV_LOG_ERROR + log_level_offset, "invalid channel mode: %d\n", fi->ch_mode);
+ av_log(avctx, AV_LOG_ERROR + log_level_offset,
+ "invalid channel mode: %d\n", fi->ch_mode);
return -1;
}
/* bits per sample */
bps_code = get_bits(gb, 3);
if (bps_code == 3 || bps_code == 7) {
- av_log(avctx, AV_LOG_ERROR + log_level_offset, "invalid sample size code (%d)\n",
+ av_log(avctx, AV_LOG_ERROR + log_level_offset,
+ "invalid sample size code (%d)\n",
bps_code);
return -1;
}
@@ -73,20 +75,23 @@ int ff_flac_decode_frame_header(AVCodecContext *avctx, GetBitContext *gb,
/* reserved bit */
if (get_bits1(gb)) {
- av_log(avctx, AV_LOG_ERROR + log_level_offset, "broken stream, invalid padding\n");
+ av_log(avctx, AV_LOG_ERROR + log_level_offset,
+ "broken stream, invalid padding\n");
return -1;
}
/* sample or frame count */
fi->frame_or_sample_num = get_utf8(gb);
if (fi->frame_or_sample_num < 0) {
- av_log(avctx, AV_LOG_ERROR + log_level_offset, "sample/frame number invalid; utf8 fscked\n");
+ av_log(avctx, AV_LOG_ERROR + log_level_offset,
+ "sample/frame number invalid; utf8 fscked\n");
return -1;
}
/* blocksize */
if (bs_code == 0) {
- av_log(avctx, AV_LOG_ERROR + log_level_offset, "reserved blocksize code: 0\n");
+ av_log(avctx, AV_LOG_ERROR + log_level_offset,
+ "reserved blocksize code: 0\n");
return -1;
} else if (bs_code == 6) {
fi->blocksize = get_bits(gb, 8) + 1;
@@ -106,7 +111,8 @@ int ff_flac_decode_frame_header(AVCodecContext *avctx, GetBitContext *gb,
} else if (sr_code == 14) {
fi->samplerate = get_bits(gb, 16) * 10;
} else {
- av_log(avctx, AV_LOG_ERROR + log_level_offset, "illegal sample rate code %d\n",
+ av_log(avctx, AV_LOG_ERROR + log_level_offset,
+ "illegal sample rate code %d\n",
sr_code);
return -1;
}
@@ -115,7 +121,8 @@ int ff_flac_decode_frame_header(AVCodecContext *avctx, GetBitContext *gb,
skip_bits(gb, 8);
if (av_crc(av_crc_get_table(AV_CRC_8_ATM), 0, gb->buffer,
get_bits_count(gb)/8)) {
- av_log(avctx, AV_LOG_ERROR + log_level_offset, "header crc mismatch\n");
+ av_log(avctx, AV_LOG_ERROR + log_level_offset,
+ "header crc mismatch\n");
return -1;
}