avconv: use AVFrame.width/height/format instead of corresponding AVCodecContext fields
authorAnton Khirnov <anton@khirnov.net>
Sat, 31 Dec 2011 16:15:50 +0000 (17:15 +0100)
committerAnton Khirnov <anton@khirnov.net>
Thu, 12 Jan 2012 08:02:01 +0000 (09:02 +0100)
avconv.c

index c96cc73..817c0cf 100644 (file)
--- a/avconv.c
+++ b/avconv.c
@@ -1262,19 +1262,18 @@ static void do_video_resample(OutputStream *ost,
                               AVFrame **out_picture)
 {
     int resample_changed = 0;
-    AVCodecContext *dec = ist->st->codec;
     *out_picture = in_picture;
 
-    resample_changed = ost->resample_width   != dec->width  ||
-                       ost->resample_height  != dec->height ||
-                       ost->resample_pix_fmt != dec->pix_fmt;
+    resample_changed = ost->resample_width   != in_picture->width  ||
+                       ost->resample_height  != in_picture->height ||
+                       ost->resample_pix_fmt != in_picture->format;
 
     if (resample_changed) {
         av_log(NULL, AV_LOG_INFO,
                "Input stream #%d:%d frame changed from size:%dx%d fmt:%s to size:%dx%d fmt:%s\n",
                ist->file_index, ist->st->index,
                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));
+               in_picture->width, in_picture->height, av_get_pix_fmt_name(in_picture->format));
         if (!ost->video_resample)
             ost->video_resample = 1;
     }
@@ -1301,9 +1300,9 @@ static void do_video_resample(OutputStream *ost,
               0, ost->resample_height, (*out_picture)->data, (*out_picture)->linesize);
     }
     if (resample_changed) {
-        ost->resample_width   = dec->width;
-        ost->resample_height  = dec->height;
-        ost->resample_pix_fmt = dec->pix_fmt;
+        ost->resample_width   = in_picture->width;
+        ost->resample_height  = in_picture->height;
+        ost->resample_pix_fmt = in_picture->format;
     }
 }
 #endif