Originally committed as revision 25068 to svn://svn.ffmpeg.org/ffmpeg/trunk
Unified · Split
| @@ -1736,8 +1736,8 @@ static int input_request_frame(AVFilterLink *link) · 1735 unmodified lines | |||
| 1736 | } else { | 1736 | } else { |
| 1737 | picref = avfilter_get_video_buffer(link, AV_PERM_WRITE, link->w, link->h); | 1737 | picref = avfilter_get_video_buffer(link, AV_PERM_WRITE, link->w, link->h); |
| 1738 | av_image_copy(picref->data, picref->linesize, | 1738 | av_image_copy(picref->data, picref->linesize, |
| 1739 | priv->frame->data, priv->frame->linesize, | 1739 | priv->frame->data, priv->frame->linesize, |
| 1740 | picref->format, link->w, link->h); | 1740 | picref->format, link->w, link->h); |
| 1741 | } | 1741 | } |
| 1742 | av_free_packet(&pkt); | 1742 | av_free_packet(&pkt); |
| 1743 | 1743 | ||
| @@ -807,7 +807,7 @@ void av_picture_copy(AVPicture *dst, const AVPicture *src, · 806 unmodified lines | |||
| 807 | enum PixelFormat pix_fmt, int width, int height) | 807 | enum PixelFormat pix_fmt, int width, int height) |
| 808 | { | 808 | { |
| 809 | av_image_copy(dst->data, dst->linesize, src->data, | 809 | av_image_copy(dst->data, dst->linesize, src->data, |
| 810 | src->linesize, pix_fmt, width, height); | 810 | src->linesize, pix_fmt, width, height); |
| 811 | } | 811 | } |
| 812 | 812 | ||
| 813 | /* 2x2 -> 1x1 */ | 813 | /* 2x2 -> 1x1 */ |
| @@ -120,8 +120,8 @@ static int request_frame(AVFilterLink *link) · 119 unmodified lines | |||
| 120 | link->w, link->h); | 120 | link->w, link->h); |
| 121 | 121 | ||
| 122 | av_image_copy(picref->data, picref->linesize, | 122 | av_image_copy(picref->data, picref->linesize, |
| 123 | c->frame.data, c->frame.linesize, | 123 | c->frame.data, c->frame.linesize, |
| 124 | picref->format, link->w, link->h); | 124 | picref->format, link->w, link->h); |
| 125 | 125 | ||
| 126 | picref->pts = c->pts; | 126 | picref->pts = c->pts; |
| 127 | picref->video->pixel_aspect = c->pixel_aspect; | 127 | picref->video->pixel_aspect = c->pixel_aspect; |