[SCM] libav/experimental: Fix fate breakage in r26382.

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Jun 30 17:22:02 UTC 2013


The following commit has been merged in the experimental branch:
commit 84cac86e7e82e287c8ea98d8f43d655ab553c07b
Author: Ronald S. Bultje <rsbultje at gmail.com>
Date:   Sun Jan 16 03:20:03 2011 +0000

    Fix fate breakage in r26382.
    
    Originally committed as revision 26383 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavfilter/defaults.c b/libavfilter/defaults.c
index 6aa1020..98339b6 100644
--- a/libavfilter/defaults.c
+++ b/libavfilter/defaults.c
@@ -209,7 +209,6 @@ int avfilter_default_config_output_link(AVFilterLink *link)
         if (link->type == AVMEDIA_TYPE_VIDEO) {
             link->w = link->src->inputs[0]->w;
             link->h = link->src->inputs[0]->h;
-            link->sample_aspect_ratio = link->src->inputs[0]->sample_aspect_ratio;
             link->time_base = link->src->inputs[0]->time_base;
         } else if (link->type == AVMEDIA_TYPE_AUDIO) {
             link->channel_layout = link->src->inputs[0]->channel_layout;

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list