diff options
author | S.N. Hemanth Meenakshisundaram <smeenaks@ucsd.edu> | 2010-08-07 05:15:19 +0400 |
---|---|---|
committer | Stefano Sabatini <stefano.sabatini-lala@poste.it> | 2010-08-07 05:15:19 +0400 |
commit | ecc8dada379261b8ad3788336cdc9d15de55b64b (patch) | |
tree | fed81eca2de81e396ca6dff69760539b2b4d99f7 /libavfilter/vf_pad.c | |
parent | e11b104a687343993cdffd4b7d1c06fcc6f31be0 (diff) |
Rename AVFilterPicRef to AVFilterBufferRef.
The struct is going to be used for storing audio buffer references as
well, and the new name is more generic.
Patch by S.N. Hemanth Meenakshisundaram @smeenaks@ucsd@edu@.
Originally committed as revision 24730 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavfilter/vf_pad.c')
-rw-r--r-- | libavfilter/vf_pad.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/libavfilter/vf_pad.c b/libavfilter/vf_pad.c index 76bc4d38ca..e6b9e48ca1 100644 --- a/libavfilter/vf_pad.c +++ b/libavfilter/vf_pad.c @@ -83,7 +83,7 @@ static int fill_line_with_color(uint8_t *line[4], int line_step[4], int w, uint8 return 0; } -static void draw_rectangle(AVFilterPicRef *outpic, uint8_t *line[4], int line_step[4], +static void draw_rectangle(AVFilterBufferRef *outpic, uint8_t *line[4], int line_step[4], int hsub, int vsub, int x, int y, int w, int h) { int i, plane; @@ -221,11 +221,11 @@ static int config_output(AVFilterLink *outlink) return 0; } -static AVFilterPicRef *get_video_buffer(AVFilterLink *inlink, int perms, int w, int h) +static AVFilterBufferRef *get_video_buffer(AVFilterLink *inlink, int perms, int w, int h) { PadContext *pad = inlink->dst->priv; - AVFilterPicRef *picref = avfilter_get_video_buffer(inlink->dst->outputs[0], perms, + AVFilterBufferRef *picref = avfilter_get_video_buffer(inlink->dst->outputs[0], perms, w + (pad->w - pad->in_w), h + (pad->h - pad->in_h)); int plane; @@ -241,10 +241,10 @@ static AVFilterPicRef *get_video_buffer(AVFilterLink *inlink, int perms, int w, return picref; } -static void start_frame(AVFilterLink *inlink, AVFilterPicRef *inpicref) +static void start_frame(AVFilterLink *inlink, AVFilterBufferRef *inpicref) { PadContext *pad = inlink->dst->priv; - AVFilterPicRef *outpicref = avfilter_ref_pic(inpicref, ~0); + AVFilterBufferRef *outpicref = avfilter_ref_pic(inpicref, ~0); int plane; inlink->dst->outputs[0]->outpic = outpicref; @@ -292,7 +292,7 @@ static void draw_send_bar_slice(AVFilterLink *link, int y, int h, int slice_dir, static void draw_slice(AVFilterLink *link, int y, int h, int slice_dir) { PadContext *pad = link->dst->priv; - AVFilterPicRef *outpic = link->dst->outputs[0]->outpic; + AVFilterBufferRef *outpic = link->dst->outputs[0]->outpic; y += pad->y; @@ -427,7 +427,7 @@ static int color_config_props(AVFilterLink *inlink) static int color_request_frame(AVFilterLink *link) { ColorContext *color = link->src->priv; - AVFilterPicRef *picref = avfilter_get_video_buffer(link, AV_PERM_WRITE, color->w, color->h); + AVFilterBufferRef *picref = avfilter_get_video_buffer(link, AV_PERM_WRITE, color->w, color->h); picref->pixel_aspect = (AVRational) {1, 1}; picref->pts = av_rescale_q(color->pts++, color->time_base, AV_TIME_BASE_Q); picref->pos = 0; |