diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-03-13 01:55:08 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-03-13 01:56:41 +0100 |
| commit | ff3e8564c440b03dc9cf72f3a7536fe4880ad72e (patch) | |
| tree | eb526f5d4bb3689fb10732c4556c67c0fd9122cf /libavcodec | |
| parent | 047c5e177ae0cffdb1f3648a31a96784d2cf94c0 (diff) | |
| parent | e3232f34312f8187094c875445683277ed0c209d (diff) | |
| download | ffmpeg-ff3e8564c440b03dc9cf72f3a7536fe4880ad72e.tar.gz | |
Merge commit 'e3232f34312f8187094c875445683277ed0c209d'
* 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>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/svq1dec.c | 2 | ||||
| -rw-r--r-- | libavcodec/utils.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/svq1dec.c b/libavcodec/svq1dec.c index ec961e733a..f571075b1b 100644 --- a/libavcodec/svq1dec.c +++ b/libavcodec/svq1dec.c @@ -793,7 +793,7 @@ static av_cold int svq1_decode_end(AVCodecContext *avctx) { SVQ1Context *s = avctx->priv_data; - avcodec_free_frame(&s->prev); + av_frame_free(&s->prev); return 0; } diff --git a/libavcodec/utils.c b/libavcodec/utils.c index 8475c67ec6..13f8d0f231 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -782,7 +782,7 @@ do { \ for (i = 0; i < FFMIN(planes, FF_ARRAY_ELEMS(frame->buf)); i++) 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], frame->extended_data[i + FF_ARRAY_ELEMS(frame->buf)], frame->linesize[0]); |