Browse Source

* fixed decoding busy loop

Originally committed as revision 203 to svn://svn.ffmpeg.org/ffmpeg/trunk
tags/v0.5
Zdenek Kabelac 24 years ago
parent
commit
92d24f49f8
1 changed files with 2 additions and 1 deletions
  1. +2
    -1
      libavcodec/mpegaudiodec.c

+ 2
- 1
libavcodec/mpegaudiodec.c View File

@@ -2270,7 +2270,7 @@ static int decode_frame(AVCodecContext * avctx,
len = HEADER_SIZE - len; len = HEADER_SIZE - len;
if (len > buf_size) if (len > buf_size)
len = buf_size; len = buf_size;
else if (len > 0) {
if (len > 0) {
memcpy(s->inbuf_ptr, buf_ptr, len); memcpy(s->inbuf_ptr, buf_ptr, len);
buf_ptr += len; buf_ptr += len;
buf_size -= len; buf_size -= len;
@@ -2280,6 +2280,7 @@ static int decode_frame(AVCodecContext * avctx,
got_header: got_header:
header = (s->inbuf[0] << 24) | (s->inbuf[1] << 16) | header = (s->inbuf[0] << 24) | (s->inbuf[1] << 16) |
(s->inbuf[2] << 8) | s->inbuf[3]; (s->inbuf[2] << 8) | s->inbuf[3];

if (check_header(header) < 0) { if (check_header(header) < 0) {
/* no sync found : move by one byte (inefficient, but simple!) */ /* no sync found : move by one byte (inefficient, but simple!) */
memcpy(s->inbuf, s->inbuf + 1, s->inbuf_ptr - s->inbuf - 1); memcpy(s->inbuf, s->inbuf + 1, s->inbuf_ptr - s->inbuf - 1);


Loading…
Cancel
Save