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

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

Issue 4533003: patched ffmpeg nov 2 (Closed) Base URL: svn://chrome-svn/chrome/trunk/deps/third_party/ffmpeg/
Patch Set: '' Created 10 years, 1 month 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
Index: source/patched-ffmpeg-mt/libavfilter/vsrc_buffer.c
===================================================================
--- source/patched-ffmpeg-mt/libavfilter/vsrc_buffer.c (revision 65184)
+++ source/patched-ffmpeg-mt/libavfilter/vsrc_buffer.c (working copy)
@@ -33,6 +33,7 @@
int has_frame;
int h, w;
enum PixelFormat pix_fmt;
+ AVRational time_base; ///< time_base to set in the output link
AVRational pixel_aspect;
} BufferSourceContext;
@@ -66,8 +67,9 @@
char pix_fmt_str[128];
int n = 0;
- if (!args || (n = sscanf(args, "%d:%d:%127s", &c->w, &c->h, pix_fmt_str)) != 3) {
- av_log(ctx, AV_LOG_ERROR, "Expected 3 arguments, but only %d found in '%s'\n", n, args ? args : "");
+ if (!args ||
+ (n = sscanf(args, "%d:%d:%127[^:]:%d:%d", &c->w, &c->h, pix_fmt_str, &c->time_base.num, &c->time_base.den)) != 5) {
+ av_log(ctx, AV_LOG_ERROR, "Expected 5 arguments, but only %d found in '%s'\n", n, args);
return AVERROR(EINVAL);
}
if ((c->pix_fmt = av_get_pix_fmt(pix_fmt_str)) == PIX_FMT_NONE) {
@@ -98,6 +100,7 @@
link->w = c->w;
link->h = c->h;
+ link->time_base = c->time_base;
return 0;
}

Powered by Google App Engine
This is Rietveld 408576698