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

Unified Diff: source/patched-ffmpeg-mt/libavfilter/avfilter.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/avfilter.c
===================================================================
--- source/patched-ffmpeg-mt/libavfilter/avfilter.c (revision 65184)
+++ source/patched-ffmpeg-mt/libavfilter/avfilter.c (working copy)
@@ -23,6 +23,7 @@
#include "libavcodec/audioconvert.c"
#include "libavutil/pixdesc.h"
+#include "libavutil/rational.h"
#include "libavcore/imgutils.h"
#include "avfilter.h"
#include "internal.h"
@@ -156,6 +157,7 @@
{
int (*config_link)(AVFilterLink *);
unsigned i;
+ int ret;
for (i = 0; i < filter->input_count; i ++) {
AVFilterLink *link = filter->inputs[i];
@@ -171,17 +173,21 @@
case AVLINK_UNINIT:
link->init_state = AVLINK_STARTINIT;
- if (avfilter_config_links(link->src))
- return -1;
+ if ((ret = avfilter_config_links(link->src)) < 0)
+ return ret;
if (!(config_link = link->srcpad->config_props))
config_link = avfilter_default_config_output_link;
- if (config_link(link))
- return -1;
+ if ((ret = config_link(link)) < 0)
+ return ret;
+ if (link->time_base.num == 0 && link->time_base.den == 0)
+ link->time_base = link->src && link->src->input_count ?
+ link->src->inputs[0]->time_base : AV_TIME_BASE_Q;
+
if ((config_link = link->dstpad->config_props))
- if (config_link(link))
- return -1;
+ if ((ret = config_link(link)) < 0)
+ return ret;
link->init_state = AVLINK_INIT;
}

Powered by Google App Engine
This is Rietveld 408576698