mirror of https://git.ffmpeg.org/ffmpeg.git
Cosmetics: fix some whitespace errors
This commit is contained in:
parent
6345184fc9
commit
3ce50bf51d
|
@ -248,11 +248,11 @@ typedef struct WmallDecodeCtx {
|
||||||
int quant_stepsize;
|
int quant_stepsize;
|
||||||
|
|
||||||
struct {
|
struct {
|
||||||
int order;
|
int order;
|
||||||
int scaling;
|
int scaling;
|
||||||
int coefsend;
|
int coefsend;
|
||||||
int bitsend;
|
int bitsend;
|
||||||
int16_t coefs[256];
|
int16_t coefs[256];
|
||||||
int lms_prevvalues[512]; // FIXME: see above
|
int lms_prevvalues[512]; // FIXME: see above
|
||||||
int16_t lms_updates[512]; // and here too
|
int16_t lms_updates[512]; // and here too
|
||||||
int recent;
|
int recent;
|
||||||
|
@ -523,12 +523,11 @@ static int decode_tilehdr(WmallDecodeCtx *s)
|
||||||
for (c = 0; c < s->num_channels; c++) {
|
for (c = 0; c < s->num_channels; c++) {
|
||||||
if (num_samples[c] == min_channel_len) {
|
if (num_samples[c] == min_channel_len) {
|
||||||
if (fixed_channel_layout || channels_for_cur_subframe == 1 ||
|
if (fixed_channel_layout || channels_for_cur_subframe == 1 ||
|
||||||
(min_channel_len == s->samples_per_frame - s->min_samples_per_subframe)) {
|
(min_channel_len == s->samples_per_frame - s->min_samples_per_subframe)) {
|
||||||
contains_subframe[c] = 1;
|
contains_subframe[c] = 1;
|
||||||
}
|
} else {
|
||||||
else {
|
|
||||||
contains_subframe[c] = get_bits1(&s->gb);
|
contains_subframe[c] = get_bits1(&s->gb);
|
||||||
}
|
}
|
||||||
} else
|
} else
|
||||||
contains_subframe[c] = 0;
|
contains_subframe[c] = 0;
|
||||||
}
|
}
|
||||||
|
@ -553,7 +552,7 @@ static int decode_tilehdr(WmallDecodeCtx *s)
|
||||||
if (num_samples[c] > s->samples_per_frame) {
|
if (num_samples[c] > s->samples_per_frame) {
|
||||||
av_log(s->avctx, AV_LOG_ERROR, "broken frame: "
|
av_log(s->avctx, AV_LOG_ERROR, "broken frame: "
|
||||||
"channel len(%d) > samples_per_frame(%d)\n",
|
"channel len(%d) > samples_per_frame(%d)\n",
|
||||||
num_samples[c], s->samples_per_frame);
|
num_samples[c], s->samples_per_frame);
|
||||||
return AVERROR_INVALIDDATA;
|
return AVERROR_INVALIDDATA;
|
||||||
}
|
}
|
||||||
} else if (num_samples[c] <= min_channel_len) {
|
} else if (num_samples[c] <= min_channel_len) {
|
||||||
|
@ -1471,7 +1470,7 @@ static int decode_packet(AVCodecContext *avctx,
|
||||||
|
|
||||||
/** decode the cross packet frame if it is valid */
|
/** decode the cross packet frame if it is valid */
|
||||||
if (!s->packet_loss)
|
if (!s->packet_loss)
|
||||||
decode_frame(s);
|
decode_frame(s);
|
||||||
} else if (s->num_saved_bits - s->frame_offset) {
|
} else if (s->num_saved_bits - s->frame_offset) {
|
||||||
dprintf(avctx, "ignoring %x previously saved bits\n",
|
dprintf(avctx, "ignoring %x previously saved bits\n",
|
||||||
s->num_saved_bits - s->frame_offset);
|
s->num_saved_bits - s->frame_offset);
|
||||||
|
@ -1509,7 +1508,7 @@ static int decode_packet(AVCodecContext *avctx,
|
||||||
s->packet_done = !decode_frame(s);
|
s->packet_done = !decode_frame(s);
|
||||||
} else {
|
} else {
|
||||||
s->packet_done = 1;
|
s->packet_done = 1;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (s->packet_done && !s->packet_loss &&
|
if (s->packet_done && !s->packet_loss &&
|
||||||
|
|
Loading…
Reference in New Issue