diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-09-07 03:24:55 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-09-07 05:24:48 +0200 |
| commit | a33b4bc79ce5001552a5429cba015089cfd603a8 (patch) | |
| tree | f5fff624db664c0cfb6c5a0ae897d1341f767bd7 /libavfilter/buffer.c | |
| parent | c9a0f9bf3ce263f1c0941070225e9a5f97b773bc (diff) | |
lavfi: factor copy_video_props() out
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/buffer.c')
| -rw-r--r-- | libavfilter/buffer.c | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/libavfilter/buffer.c b/libavfilter/buffer.c index 510dd2d746..d7070928bb 100644 --- a/libavfilter/buffer.c +++ b/libavfilter/buffer.c @@ -39,6 +39,15 @@ void ff_avfilter_default_free_buffer(AVFilterBuffer *ptr) av_free(ptr); } +static void copy_video_props(AVFilterBufferRefVideoProps *dst, AVFilterBufferRefVideoProps *src) { + *dst = *src; + if (src->qp_table) { + int qsize = src->qp_table_linesize ? (src->qp_table_linesize * (src->h+15)/16) : (src->w+15)/16; + dst->qp_table = av_malloc(qsize); + memcpy(dst->qp_table, src->qp_table, qsize); + } +} + AVFilterBufferRef *avfilter_ref_buffer(AVFilterBufferRef *ref, int pmask) { AVFilterBufferRef *ret = av_malloc(sizeof(AVFilterBufferRef)); @@ -51,12 +60,7 @@ AVFilterBufferRef *avfilter_ref_buffer(AVFilterBufferRef *ref, int pmask) av_free(ret); return NULL; } - *ret->video = *ref->video; - if (ref->video->qp_table) { - int qsize = ref->video->qp_table_linesize ? ref->video->qp_table_linesize * ((ref->video->h+15)/16) : (ref->video->w+15)/16; - ret->video->qp_table = av_malloc(qsize); - memcpy(ret->video->qp_table, ref->video->qp_table, qsize); - } + copy_video_props(ret->video, ref->video); ret->extended_data = ret->data; } else if (ref->type == AVMEDIA_TYPE_AUDIO) { ret->audio = av_malloc(sizeof(AVFilterBufferRefAudioProps)); @@ -187,12 +191,7 @@ void avfilter_copy_buffer_ref_props(AVFilterBufferRef *dst, AVFilterBufferRef *s case AVMEDIA_TYPE_VIDEO: { if (dst->video->qp_table) av_freep(&dst->video->qp_table); - *dst->video = *src->video; - if (src->video->qp_table) { - int qsize = src->video->qp_table_linesize ? src->video->qp_table_linesize * ((src->video->h+15)/16) : (src->video->w+15)/16; - dst->video->qp_table = av_malloc(qsize); - memcpy(dst->video->qp_table, src->video->qp_table, qsize); - } + copy_video_props(dst->video, src->video); break; } case AVMEDIA_TYPE_AUDIO: *dst->audio = *src->audio; break; |