vsrc_buffer: Set output size Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Michael Niedermayer committed 15 years ago

Commit a38cdfd1 parent ad0193b2 files · +7 −2Browse files

Unified · Split

2 files

@@ -1638,7 +1638,7 @@ static int output_packet(AVInputStream *ist, int ist_index, · 1637 unmodified lines
1638	av_vsrc_buffer_add_frame2(ost->input_video_filter, &picture,	1638	av_vsrc_buffer_add_frame2(ost->input_video_filter, &picture,
1639	ist->pts,	1639	ist->pts,
1640	sar, ist->st->codec->width, ist->st->codec->height,	1640	sar, ist->st->codec->width, ist->st->codec->height,
1641	ist->st->codec->pix_fmt, "0:0"); //TODO user setable params	1641	ist->st->codec->pix_fmt, ""); //TODO user setable params
1642	}	1642	}
1643	}	1643	}
1644	}	1644	}

     enum PixelFormat  pix_fmt;
     AVRational        time_base;     ///< time_base to set in the output link
     AVRational        pixel_aspect;
+    char              sws_param[256];
 } BufferSourceContext;
 int av_vsrc_buffer_add_frame2(AVFilterContext *buffer_filter, AVFrame *frame,
         //return -1;
     }
+    if(!c->sws_param[0]){
+        snprintf(c->sws_param, 255, "%d:%d:%s", c->w, c->h, sws_param);
+    }
     if(width != c->w || height != c->h || pix_fmt != c->pix_fmt){
         AVFilterContext *scale= buffer_filter->outputs[0]->dst;
         AVFilterLink *link;
             if(avfilter_open(&scale, f, "Input equalizer") < 0)
                 return -1;
-            if((ret=avfilter_init_filter(scale, sws_param, NULL))<0){
+            if((ret=avfilter_init_filter(scale, c->sws_param, NULL))<0){
                 avfilter_free(scale);
                 return ret;
             }

Keyboard shortcuts