X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavfilter%2Fvideo.c;h=4d8804ba10ccde76602afffa95b1202d52b0d674;hb=95d07f33dc5c43f9cc4a42466e9ce2a85cf4694e;hp=ebc8cf4fc68553e7d21e7d3f422c470fe65d0a4b;hpb=d15be9108e6a17e6fdc224fb8cd2640b825dd408;p=ffmpeg

diff --git a/libavfilter/video.c b/libavfilter/video.c
index ebc8cf4fc68..4d8804ba10c 100644
--- a/libavfilter/video.c
+++ b/libavfilter/video.c
@@ -249,9 +249,11 @@ int ff_start_frame(AVFilterLink *link, AVFilterBufferRef *picref)
 
     FF_TPRINTF_START(NULL, start_frame); ff_tlog_link(NULL, link, 0); ff_tlog(NULL, " "); ff_tlog_ref(NULL, picref, 1);
 
-    av_assert1(picref->format                     == link->format);
-    av_assert1(picref->video->w                   == link->w);
-    av_assert1(picref->video->h                   == link->h);
+    if (strcmp(link->dst->filter->name, "scale")) {
+        av_assert1(picref->format                     == link->format);
+        av_assert1(picref->video->w                   == link->w);
+        av_assert1(picref->video->h                   == link->h);
+    }
 
     if (link->closed) {
         avfilter_unref_buffer(picref);
@@ -284,7 +286,7 @@ int ff_start_frame(AVFilterLink *link, AVFilterBufferRef *picref)
         avfilter_copy_buffer_ref_props(link->cur_buf, link->src_buf);
 
         /* copy palette if required */
-        if (av_pix_fmt_descriptors[link->format].flags & PIX_FMT_PAL)
+        if (av_pix_fmt_desc_get(link->format)->flags & PIX_FMT_PAL)
             memcpy(link->cur_buf->data[1], link->src_buf-> data[1], AVPALETTE_SIZE);
     }
     else