Commit 0b95f011 authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit '8f24c12b'

* commit '8f24c12b':
  ac3dec: Don't consume more data than the actual input packet size
Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 95126728 8f24c12b
......@@ -1308,7 +1308,7 @@ static int ac3_decode_frame(AVCodecContext * avctx, void *data,
av_log(avctx, AV_LOG_ERROR, "unsupported frame type : "
"skipping frame\n");
*got_frame_ptr = 0;
return s->frame_size;
return buf_size;
} else {
av_log(avctx, AV_LOG_ERROR, "invalid frame type\n");
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment