virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

Merge commit '684e3d2e1ce96625eeef63f2564aab66f6715d05'

Browse Source 
* commit '684e3d2e1ce96625eeef63f2564aab66f6715d05':
  ra144: check buffer size before requesting a buffer
  wmapro: unref skipped frames

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-03-13 02:02:00 +01:00
commit e5949cc12a
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
libavcodec/ra144dec.c
View File

@ -76,6 +76,13 @@ static int ra144_decode_frame(AVCodecContext * avctx, void *data,
RA144Context *ractx = avctx->priv_data;
GetBitContext gb;
if (buf_size < FRAMESIZE) {
av_log(avctx, AV_LOG_ERROR,
"Frame too small (%d bytes). Truncated file?\n", buf_size);
*got_frame_ptr = 0;
return AVERROR_INVALIDDATA;
}
/* get output buffer */
frame->nb_samples = NBLOCKS * BLOCKSIZE;
if ((ret = ff_get_buffer(avctx, frame, 0)) < 0) {
@ -84,12 +91,6 @@ static int ra144_decode_frame(AVCodecContext * avctx, void *data,
}
samples = (int16_t *)frame->data[0];
if(buf_size < FRAMESIZE) {
av_log(avctx, AV_LOG_ERROR,
"Frame too small (%d bytes). Truncated file?\n", buf_size);
*got_frame_ptr = 0;
return buf_size;
}
init_get_bits(&gb, buf, FRAMESIZE * 8);
for (i = 0; i < LPC_ORDER; i++)

1
libavcodec/wmaprodec.c
View File

@ -1399,6 +1399,7 @@ static int decode_frame(WMAProDecodeCtx *s, AVFrame *frame, int *got_frame_ptr)
if (s->skip_frame) {
s->skip_frame = 0;
*got_frame_ptr = 0;
av_frame_unref(frame);
} else {
*got_frame_ptr = 1;
}