mirror of https://git.ffmpeg.org/ffmpeg.git
lavfi: use avfilter_unref_bufferp() where appropriate.
This commit is contained in:
parent
043800a968
commit
02ac7311c8
12
avplay.c
12
avplay.c
|
@ -1235,10 +1235,7 @@ static void stream_close(VideoState *is)
|
||||||
for (i = 0; i < VIDEO_PICTURE_QUEUE_SIZE; i++) {
|
for (i = 0; i < VIDEO_PICTURE_QUEUE_SIZE; i++) {
|
||||||
vp = &is->pictq[i];
|
vp = &is->pictq[i];
|
||||||
#if CONFIG_AVFILTER
|
#if CONFIG_AVFILTER
|
||||||
if (vp->picref) {
|
avfilter_unref_bufferp(&vp->picref);
|
||||||
avfilter_unref_buffer(vp->picref);
|
|
||||||
vp->picref = NULL;
|
|
||||||
}
|
|
||||||
#endif
|
#endif
|
||||||
if (vp->bmp) {
|
if (vp->bmp) {
|
||||||
SDL_FreeYUVOverlay(vp->bmp);
|
SDL_FreeYUVOverlay(vp->bmp);
|
||||||
|
@ -1287,9 +1284,7 @@ static void alloc_picture(void *opaque)
|
||||||
SDL_FreeYUVOverlay(vp->bmp);
|
SDL_FreeYUVOverlay(vp->bmp);
|
||||||
|
|
||||||
#if CONFIG_AVFILTER
|
#if CONFIG_AVFILTER
|
||||||
if (vp->picref)
|
avfilter_unref_bufferp(&vp->picref);
|
||||||
avfilter_unref_buffer(vp->picref);
|
|
||||||
vp->picref = NULL;
|
|
||||||
|
|
||||||
vp->width = is->out_video_filter->inputs[0]->w;
|
vp->width = is->out_video_filter->inputs[0]->w;
|
||||||
vp->height = is->out_video_filter->inputs[0]->h;
|
vp->height = is->out_video_filter->inputs[0]->h;
|
||||||
|
@ -1382,8 +1377,7 @@ static int queue_picture(VideoState *is, AVFrame *src_frame, double pts, int64_t
|
||||||
if (vp->bmp) {
|
if (vp->bmp) {
|
||||||
AVPicture pict = { { 0 } };
|
AVPicture pict = { { 0 } };
|
||||||
#if CONFIG_AVFILTER
|
#if CONFIG_AVFILTER
|
||||||
if (vp->picref)
|
avfilter_unref_bufferp(&vp->picref);
|
||||||
avfilter_unref_buffer(vp->picref);
|
|
||||||
vp->picref = src_frame->opaque;
|
vp->picref = src_frame->opaque;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
|
@ -248,7 +248,7 @@ static void join_uninit(AVFilterContext *ctx)
|
||||||
|
|
||||||
for (i = 0; i < ctx->nb_inputs; i++) {
|
for (i = 0; i < ctx->nb_inputs; i++) {
|
||||||
av_freep(&ctx->input_pads[i].name);
|
av_freep(&ctx->input_pads[i].name);
|
||||||
avfilter_unref_buffer(s->input_frames[i]);
|
avfilter_unref_bufferp(&s->input_frames[i]);
|
||||||
}
|
}
|
||||||
|
|
||||||
av_freep(&s->channels);
|
av_freep(&s->channels);
|
||||||
|
@ -402,7 +402,7 @@ static void join_free_buffer(AVFilterBuffer *buf)
|
||||||
int i;
|
int i;
|
||||||
|
|
||||||
for (i = 0; i < priv->nb_in_buffers; i++)
|
for (i = 0; i < priv->nb_in_buffers; i++)
|
||||||
avfilter_unref_buffer(priv->in_buffers[i]);
|
avfilter_unref_bufferp(&priv->in_buffers[i]);
|
||||||
|
|
||||||
av_freep(&priv->in_buffers);
|
av_freep(&priv->in_buffers);
|
||||||
av_freep(&buf->priv);
|
av_freep(&buf->priv);
|
||||||
|
|
|
@ -65,11 +65,11 @@ static av_cold void uninit(AVFilterContext *ctx)
|
||||||
|
|
||||||
for (buf = fifo->root.next; buf; buf = tmp) {
|
for (buf = fifo->root.next; buf; buf = tmp) {
|
||||||
tmp = buf->next;
|
tmp = buf->next;
|
||||||
avfilter_unref_buffer(buf->buf);
|
avfilter_unref_bufferp(&buf->buf);
|
||||||
av_free(buf);
|
av_free(buf);
|
||||||
}
|
}
|
||||||
|
|
||||||
avfilter_unref_buffer(fifo->buf_out);
|
avfilter_unref_bufferp(&fifo->buf_out);
|
||||||
}
|
}
|
||||||
|
|
||||||
static int add_to_queue(AVFilterLink *inlink, AVFilterBufferRef *buf)
|
static int add_to_queue(AVFilterLink *inlink, AVFilterBufferRef *buf)
|
||||||
|
|
|
@ -88,8 +88,7 @@ static av_cold void uninit(AVFilterContext *ctx)
|
||||||
{
|
{
|
||||||
OverlayContext *over = ctx->priv;
|
OverlayContext *over = ctx->priv;
|
||||||
|
|
||||||
if (over->overpicref)
|
avfilter_unref_bufferp(&over->overpicref);
|
||||||
avfilter_unref_buffer(over->overpicref);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static int query_formats(AVFilterContext *ctx)
|
static int query_formats(AVFilterContext *ctx)
|
||||||
|
|
|
@ -224,8 +224,7 @@ static int start_frame(AVFilterLink *link, AVFilterBufferRef *picref)
|
||||||
|
|
||||||
if (yadif->auto_enable && !yadif->cur->video->interlaced) {
|
if (yadif->auto_enable && !yadif->cur->video->interlaced) {
|
||||||
yadif->out = avfilter_ref_buffer(yadif->cur, AV_PERM_READ);
|
yadif->out = avfilter_ref_buffer(yadif->cur, AV_PERM_READ);
|
||||||
avfilter_unref_buffer(yadif->prev);
|
avfilter_unref_bufferp(&yadif->prev);
|
||||||
yadif->prev = NULL;
|
|
||||||
if (yadif->out->pts != AV_NOPTS_VALUE)
|
if (yadif->out->pts != AV_NOPTS_VALUE)
|
||||||
yadif->out->pts *= 2;
|
yadif->out->pts *= 2;
|
||||||
return ff_start_frame(ctx->outputs[0], yadif->out);
|
return ff_start_frame(ctx->outputs[0], yadif->out);
|
||||||
|
@ -327,9 +326,9 @@ static av_cold void uninit(AVFilterContext *ctx)
|
||||||
{
|
{
|
||||||
YADIFContext *yadif = ctx->priv;
|
YADIFContext *yadif = ctx->priv;
|
||||||
|
|
||||||
if (yadif->prev) avfilter_unref_buffer(yadif->prev);
|
if (yadif->prev) avfilter_unref_bufferp(&yadif->prev);
|
||||||
if (yadif->cur ) avfilter_unref_buffer(yadif->cur );
|
if (yadif->cur ) avfilter_unref_bufferp(&yadif->cur );
|
||||||
if (yadif->next) avfilter_unref_buffer(yadif->next);
|
if (yadif->next) avfilter_unref_bufferp(&yadif->next);
|
||||||
}
|
}
|
||||||
|
|
||||||
static int query_formats(AVFilterContext *ctx)
|
static int query_formats(AVFilterContext *ctx)
|
||||||
|
|
|
@ -299,8 +299,7 @@ static int request_frame(AVFilterLink *outlink)
|
||||||
|
|
||||||
ret = ff_end_frame(outlink);
|
ret = ff_end_frame(outlink);
|
||||||
fail:
|
fail:
|
||||||
avfilter_unref_buffer(movie->picref);
|
avfilter_unref_bufferp(&movie->picref);
|
||||||
movie->picref = NULL;
|
|
||||||
|
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue