diff options
| author | S.N. Hemanth Meenakshisundaram <smeenaks@ucsd.edu> | 2010-08-07 01:15:27 +0000 |
|---|---|---|
| committer | Stefano Sabatini <stefano.sabatini-lala@poste.it> | 2010-08-07 01:15:27 +0000 |
| commit | 7fce481a69053dd24dbf9f1cb0f5b51df2ec925c (patch) | |
| tree | 0f61baf91fc505244098f2aa23e8aea4f0b08704 /ffplay.c | |
| parent | ecc8dada379261b8ad3788336cdc9d15de55b64b (diff) | |
Rename functions and fields:
avfilter_(un)ref_pic -> avfilter_(un)ref_buffer
avfilter_copy_picref_props -> avfilter_copy_buffer_ref_props
AVFilterBufferRef.pic -> AVFilterBufferRef.buffer
They have been renamed to allow sharing with audio.
Patch by S.N. Hemanth Meenakshisundaram $smeenaks$ucsd$edu$.
Originally committed as revision 24731 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'ffplay.c')
| -rw-r--r-- | ffplay.c | 10 |
1 files changed, 5 insertions, 5 deletions
@@ -1304,7 +1304,7 @@ static void alloc_picture(void *opaque) #if CONFIG_AVFILTER if (vp->picref) - avfilter_unref_pic(vp->picref); + avfilter_unref_buffer(vp->picref); vp->picref = NULL; vp->width = is->out_video_filter->inputs[0]->w; @@ -1389,7 +1389,7 @@ static int queue_picture(VideoState *is, AVFrame *src_frame, double pts, int64_t AVPicture pict; #if CONFIG_AVFILTER if(vp->picref) - avfilter_unref_pic(vp->picref); + avfilter_unref_buffer(vp->picref); vp->picref = src_frame->opaque; #endif @@ -1604,7 +1604,7 @@ static int input_get_buffer(AVCodecContext *codec, AVFrame *pic) static void input_release_buffer(AVCodecContext *codec, AVFrame *pic) { memset(pic->data, 0, sizeof(pic->data)); - avfilter_unref_pic(pic->opaque); + avfilter_unref_buffer(pic->opaque); } static int input_reget_buffer(AVCodecContext *codec, AVFrame *pic) @@ -1667,7 +1667,7 @@ static int input_request_frame(AVFilterLink *link) return -1; if(priv->use_dr1) { - picref = avfilter_ref_pic(priv->frame->opaque, ~0); + picref = avfilter_ref_buffer(priv->frame->opaque, ~0); } else { picref = avfilter_get_video_buffer(link, AV_PERM_WRITE, link->w, link->h); av_picture_copy((AVPicture *)&picref->data, (AVPicture *)priv->frame, @@ -2672,7 +2672,7 @@ static void stream_close(VideoState *is) vp = &is->pictq[i]; #if CONFIG_AVFILTER if (vp->picref) { - avfilter_unref_pic(vp->picref); + avfilter_unref_buffer(vp->picref); vp->picref = NULL; } #endif |