generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge commit 'e3232f34312f8187094c875445683277ed0c209d'

Browse Source 
* commit 'e3232f34312f8187094c875445683277ed0c209d':
  svq1: use av_frame_free to free refcounted frame
  lavc: fix get_buffer() compatibility layer for audio.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2013-03-13 01:55:08 +01:00
parent 047c5e177a e3232f3431
commit ff3e8564c4
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/svq1dec.c
View File

@@ -793,7 +793,7 @@ static av_cold int svq1_decode_end(AVCodecContext *avctx)
{ {
SVQ1Context *s = avctx->priv_data; SVQ1Context *s = avctx->priv_data;
avcodec_free_frame(&s->prev); av_frame_free(&s->prev);
return 0; return 0;
} }

2
libavcodec/utils.c
View File

@@ -782,7 +782,7 @@ do { \
for (i = 0; i < FFMIN(planes, FF_ARRAY_ELEMS(frame->buf)); i++) for (i = 0; i < FFMIN(planes, FF_ARRAY_ELEMS(frame->buf)); i++)
WRAP_PLANE(frame->buf[i], frame->extended_data[i], frame->linesize[0]); WRAP_PLANE(frame->buf[i], frame->extended_data[i], frame->linesize[0]);
for (i = 0; i < planes - FF_ARRAY_ELEMS(frame->buf); i++) for (i = 0; i < frame->nb_extended_buf; i++)
WRAP_PLANE(frame->extended_buf[i], WRAP_PLANE(frame->extended_buf[i],
frame->extended_data[i + FF_ARRAY_ELEMS(frame->buf)], frame->extended_data[i + FF_ARRAY_ELEMS(frame->buf)],
frame->linesize[0]); frame->linesize[0]);