generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

cosmetics: line wrap after last commit

Browse Source 
Originally committed as revision 25913 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Justin Ruggles 2010-12-07 14:02:42 +00:00
parent 3c795698d0
commit ed4e1e5833
1 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
libavcodec/flac.c
View File

@ -58,14 +58,16 @@ int ff_flac_decode_frame_header(AVCodecContext *avctx, GetBitContext *gb,
} else if (fi->ch_mode <= FLAC_CHMODE_MID_SIDE) { } else if (fi->ch_mode <= FLAC_CHMODE_MID_SIDE) {
fi->channels = 2; fi->channels = 2;
} else { } 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; return -1;
} }
/* bits per sample */ /* bits per sample */
bps_code = get_bits(gb, 3); bps_code = get_bits(gb, 3);
if (bps_code == 3 || bps_code == 7) { 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); bps_code);
return -1; return -1;
} }
@ -73,20 +75,23 @@ int ff_flac_decode_frame_header(AVCodecContext *avctx, GetBitContext *gb,
/* reserved bit */ /* reserved bit */
if (get_bits1(gb)) { 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; return -1;
} }
/* sample or frame count */ /* sample or frame count */
fi->frame_or_sample_num = get_utf8(gb); fi->frame_or_sample_num = get_utf8(gb);
if (fi->frame_or_sample_num < 0) { 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; return -1;
} }
/* blocksize */ /* blocksize */
if (bs_code == 0) { 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; return -1;
} else if (bs_code == 6) { } else if (bs_code == 6) {
fi->blocksize = get_bits(gb, 8) + 1; 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) { } else if (sr_code == 14) {
fi->samplerate = get_bits(gb, 16) * 10; fi->samplerate = get_bits(gb, 16) * 10;
} else { } 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); sr_code);
return -1; return -1;
} }
@ -115,7 +121,8 @@ int ff_flac_decode_frame_header(AVCodecContext *avctx, GetBitContext *gb,
skip_bits(gb, 8); skip_bits(gb, 8);
if (av_crc(av_crc_get_table(AV_CRC_8_ATM), 0, gb->buffer, if (av_crc(av_crc_get_table(AV_CRC_8_ATM), 0, gb->buffer,
get_bits_count(gb)/8)) { 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; return -1;
} }