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

avutil/frame: continue to process bufs even if some are empty

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Xidorn Quan 2013-05-20 23:28:06 +08:00 committed by Michael Niedermayer
parent a67304d05f
commit 5a65fea655
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libavutil/frame.c
View File

@ -259,7 +259,9 @@ int av_frame_ref(AVFrame *dst, AVFrame *src)
} }
/* ref the buffers */ /* ref the buffers */
for (i = 0; i < FF_ARRAY_ELEMS(src->buf) && src->buf[i]; i++) { for (i = 0; i < FF_ARRAY_ELEMS(src->buf); i++) {
if (!src->buf[i])
continue;
dst->buf[i] = av_buffer_ref(src->buf[i]); dst->buf[i] = av_buffer_ref(src->buf[i]);
if (!dst->buf[i]) { if (!dst->buf[i]) {
ret = AVERROR(ENOMEM); ret = AVERROR(ENOMEM);
@ -366,8 +368,9 @@ int av_frame_is_writable(AVFrame *frame)
if (!frame->buf[0]) if (!frame->buf[0])
return 0; return 0;
for (i = 0; i < FF_ARRAY_ELEMS(frame->buf) && frame->buf[i]; i++) for (i = 0; i < FF_ARRAY_ELEMS(frame->buf); i++)
ret &= !!av_buffer_is_writable(frame->buf[i]); if (frame->buf[i])
ret &= !!av_buffer_is_writable(frame->buf[i]);
for (i = 0; i < frame->nb_extended_buf; i++) for (i = 0; i < frame->nb_extended_buf; i++)
ret &= !!av_buffer_is_writable(frame->extended_buf[i]); ret &= !!av_buffer_is_writable(frame->extended_buf[i]);