Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1531)

Unified Diff: source/patched-ffmpeg-mt/libavfilter/vsrc_buffer.c

Issue 3384002: ffmpeg source update for sep 09 (Closed) Base URL: svn://chrome-svn/chrome/trunk/deps/third_party/ffmpeg/
Patch Set: Created 10 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « source/patched-ffmpeg-mt/libavfilter/vf_scale.c ('k') | source/patched-ffmpeg-mt/libavformat/Makefile » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: source/patched-ffmpeg-mt/libavfilter/vsrc_buffer.c
===================================================================
--- source/patched-ffmpeg-mt/libavfilter/vsrc_buffer.c (revision 59334)
+++ source/patched-ffmpeg-mt/libavfilter/vsrc_buffer.c (working copy)
@@ -25,7 +25,7 @@
#include "avfilter.h"
#include "vsrc_buffer.h"
-#include "libavutil/pixdesc.h"
+#include "libavcore/imgutils.h"
typedef struct {
int64_t pts;
@@ -119,13 +119,14 @@
AV_PERM_REUSE2,
link->w, link->h);
- av_picture_copy((AVPicture *)&picref->data, (AVPicture *)&c->frame,
- picref->format, link->w, link->h);
+ av_image_copy(picref->data, picref->linesize,
+ c->frame.data, c->frame.linesize,
+ picref->format, link->w, link->h);
- picref->pts = c->pts;
- picref->pixel_aspect = c->pixel_aspect;
- picref->interlaced = c->frame.interlaced_frame;
- picref->top_field_first = c->frame.top_field_first;
+ picref->pts = c->pts;
+ picref->video->pixel_aspect = c->pixel_aspect;
+ picref->video->interlaced = c->frame.interlaced_frame;
+ picref->video->top_field_first = c->frame.top_field_first;
avfilter_start_frame(link, avfilter_ref_buffer(picref, ~0));
avfilter_draw_slice(link, 0, link->h, 1);
avfilter_end_frame(link);
« no previous file with comments | « source/patched-ffmpeg-mt/libavfilter/vf_scale.c ('k') | source/patched-ffmpeg-mt/libavformat/Makefile » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698