Originally committed as revision 25068 to svn://svn.ffmpeg.org/ffmpeg/trunktags/n0.8
| @@ -1736,8 +1736,8 @@ static int input_request_frame(AVFilterLink *link) | |||||
| } else { | } else { | ||||
| picref = avfilter_get_video_buffer(link, AV_PERM_WRITE, link->w, link->h); | picref = avfilter_get_video_buffer(link, AV_PERM_WRITE, link->w, link->h); | ||||
| av_image_copy(picref->data, picref->linesize, | av_image_copy(picref->data, picref->linesize, | ||||
| priv->frame->data, priv->frame->linesize, | |||||
| picref->format, link->w, link->h); | |||||
| priv->frame->data, priv->frame->linesize, | |||||
| picref->format, link->w, link->h); | |||||
| } | } | ||||
| av_free_packet(&pkt); | av_free_packet(&pkt); | ||||
| @@ -807,7 +807,7 @@ void av_picture_copy(AVPicture *dst, const AVPicture *src, | |||||
| enum PixelFormat pix_fmt, int width, int height) | enum PixelFormat pix_fmt, int width, int height) | ||||
| { | { | ||||
| av_image_copy(dst->data, dst->linesize, src->data, | av_image_copy(dst->data, dst->linesize, src->data, | ||||
| src->linesize, pix_fmt, width, height); | |||||
| src->linesize, pix_fmt, width, height); | |||||
| } | } | ||||
| /* 2x2 -> 1x1 */ | /* 2x2 -> 1x1 */ | ||||
| @@ -120,8 +120,8 @@ static int request_frame(AVFilterLink *link) | |||||
| link->w, link->h); | link->w, link->h); | ||||
| av_image_copy(picref->data, picref->linesize, | av_image_copy(picref->data, picref->linesize, | ||||
| c->frame.data, c->frame.linesize, | |||||
| picref->format, link->w, link->h); | |||||
| c->frame.data, c->frame.linesize, | |||||
| picref->format, link->w, link->h); | |||||
| picref->pts = c->pts; | picref->pts = c->pts; | ||||
| picref->video->pixel_aspect = c->pixel_aspect; | picref->video->pixel_aspect = c->pixel_aspect; | ||||