mirror of https://git.ffmpeg.org/ffmpeg.git
avcodec/shorten: remove useless if condition and comment, reindent
Signed-off-by: Paul B Mahol <onemda@gmail.com>
This commit is contained in:
parent
a4790e1890
commit
c18fdc8692
|
@ -445,29 +445,27 @@ static int shorten_decode_frame(AVCodecContext *avctx, void *data,
|
||||||
}
|
}
|
||||||
|
|
||||||
/* append current packet data to bitstream buffer */
|
/* append current packet data to bitstream buffer */
|
||||||
if (1 && s->max_framesize) { //FIXME truncated
|
buf_size = FFMIN(buf_size, s->max_framesize - s->bitstream_size);
|
||||||
buf_size = FFMIN(buf_size, s->max_framesize - s->bitstream_size);
|
input_buf_size = buf_size;
|
||||||
input_buf_size = buf_size;
|
|
||||||
|
|
||||||
if (s->bitstream_index + s->bitstream_size + buf_size + AV_INPUT_BUFFER_PADDING_SIZE >
|
if (s->bitstream_index + s->bitstream_size + buf_size + AV_INPUT_BUFFER_PADDING_SIZE >
|
||||||
s->allocated_bitstream_size) {
|
s->allocated_bitstream_size) {
|
||||||
memmove(s->bitstream, &s->bitstream[s->bitstream_index],
|
memmove(s->bitstream, &s->bitstream[s->bitstream_index],
|
||||||
s->bitstream_size);
|
s->bitstream_size);
|
||||||
s->bitstream_index = 0;
|
s->bitstream_index = 0;
|
||||||
}
|
}
|
||||||
if (buf)
|
if (buf)
|
||||||
memcpy(&s->bitstream[s->bitstream_index + s->bitstream_size], buf,
|
memcpy(&s->bitstream[s->bitstream_index + s->bitstream_size], buf,
|
||||||
buf_size);
|
buf_size);
|
||||||
buf = &s->bitstream[s->bitstream_index];
|
buf = &s->bitstream[s->bitstream_index];
|
||||||
buf_size += s->bitstream_size;
|
buf_size += s->bitstream_size;
|
||||||
s->bitstream_size = buf_size;
|
s->bitstream_size = buf_size;
|
||||||
|
|
||||||
/* do not decode until buffer has at least max_framesize bytes or
|
/* do not decode until buffer has at least max_framesize bytes or
|
||||||
* the end of the file has been reached */
|
* the end of the file has been reached */
|
||||||
if (buf_size < s->max_framesize && avpkt->data) {
|
if (buf_size < s->max_framesize && avpkt->data) {
|
||||||
*got_frame_ptr = 0;
|
*got_frame_ptr = 0;
|
||||||
return input_buf_size;
|
return input_buf_size;
|
||||||
}
|
|
||||||
}
|
}
|
||||||
/* init and position bitstream reader */
|
/* init and position bitstream reader */
|
||||||
if ((ret = init_get_bits8(&s->gb, buf, buf_size)) < 0)
|
if ((ret = init_get_bits8(&s->gb, buf, buf_size)) < 0)
|
||||||
|
|
Loading…
Reference in New Issue