summaryrefslogtreecommitdiff
path: root/libavfilter/buffer.c
diff options
context:
space:
mode:
authorStefano Sabatini <stefasab@gmail.com>2012-06-10 17:42:47 +0200
committerStefano Sabatini <stefasab@gmail.com>2012-06-13 10:51:33 +0200
commit465a72b4b4ad1366b47436506a1352ee0c0ef232 (patch)
tree3cec248b0c3315e3fc8ee9e17b9766ef00f51262 /libavfilter/buffer.c
parent134815a030fb0439e7caafe3a88f196b7837a609 (diff)
lavfi: move definition of avfilter_copy_buf_props() from buffer.c to avcodec.c
avcodec.c is where it is defined the lavc/lavfi interface code, so seems a more adequate location (and doesn't force the inclusion of libavcodec/avcodec.h where it is not required).
Diffstat (limited to 'libavfilter/buffer.c')
-rw-r--r--libavfilter/buffer.c44
1 files changed, 0 insertions, 44 deletions
diff --git a/libavfilter/buffer.c b/libavfilter/buffer.c
index ef8238c528..816e23c6a6 100644
--- a/libavfilter/buffer.c
+++ b/libavfilter/buffer.c
@@ -163,50 +163,6 @@ void avfilter_unref_bufferp(AVFilterBufferRef **ref)
*ref = NULL;
}
-int avfilter_copy_buf_props(AVFrame *dst, const AVFilterBufferRef *src)
-{
- int planes, nb_channels;
-
- memcpy(dst->data, src->data, sizeof(dst->data));
- memcpy(dst->linesize, src->linesize, sizeof(dst->linesize));
-
- dst->pts = src->pts;
- dst->format = src->format;
-
- switch (src->type) {
- case AVMEDIA_TYPE_VIDEO:
- dst->width = src->video->w;
- dst->height = src->video->h;
- dst->sample_aspect_ratio = src->video->sample_aspect_ratio;
- dst->interlaced_frame = src->video->interlaced;
- dst->top_field_first = src->video->top_field_first;
- dst->key_frame = src->video->key_frame;
- dst->pict_type = src->video->pict_type;
- break;
- case AVMEDIA_TYPE_AUDIO:
- nb_channels = av_get_channel_layout_nb_channels(src->audio->channel_layout);
- planes = av_sample_fmt_is_planar(src->format) ? nb_channels : 1;
-
- if (planes > FF_ARRAY_ELEMS(dst->data)) {
- dst->extended_data = av_mallocz(planes * sizeof(*dst->extended_data));
- if (!dst->extended_data)
- return AVERROR(ENOMEM);
- memcpy(dst->extended_data, src->extended_data,
- planes * sizeof(dst->extended_data));
- } else
- dst->extended_data = dst->data;
-
- dst->sample_rate = src->audio->sample_rate;
- dst->channel_layout = src->audio->channel_layout;
- dst->nb_samples = src->audio->nb_samples;
- break;
- default:
- return AVERROR(EINVAL);
- }
-
- return 0;
-}
-
void avfilter_copy_buffer_ref_props(AVFilterBufferRef *dst, AVFilterBufferRef *src)
{
// copy common properties