[FFmpeg-cvslog] Turn on resampling on sudden size change instead of bailing out during recode .

Kostya git at videolan.org
Mon Aug 15 23:55:49 CEST 2011


ffmpeg | branch: master | Kostya <kostya.shishkov at gmail.com> | Sat Aug 13 16:44:21 2011 +0000| [5c59fa56edc68de348048cc0b1235d7ade23c979] | committer: Anton Khirnov

Turn on resampling on sudden size change instead of bailing out during recode.

Signed-off-by: Anton Khirnov <anton at khirnov.net>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5c59fa56edc68de348048cc0b1235d7ade23c979
---

 avconv.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/avconv.c b/avconv.c
index 18c5f07..74db59f 100644
--- a/avconv.c
+++ b/avconv.c
@@ -1186,7 +1186,7 @@ static void do_video_out(AVFormatContext *s,
                ost->resample_width, ost->resample_height, av_get_pix_fmt_name(ost->resample_pix_fmt),
                dec->width         , dec->height         , av_get_pix_fmt_name(dec->pix_fmt));
         if(!ost->video_resample)
-            exit_program(1);
+            ost->video_resample = 1;
     }
 
 #if !CONFIG_AVFILTER



More information about the ffmpeg-cvslog mailing list