Merge branch 'main' into auto-pipeline-t2v-i2v

Author: hlky

src/diffusers/models/autoencoders/vae.py

@@ -255,7 +255,7 @@ def __init__(
                 num_layers=self.layers_per_block + 1,
                 in_channels=prev_output_channel,
                 out_channels=output_channel,
-                prev_output_channel=None,
+                prev_output_channel=prev_output_channel,
                 add_upsample=not is_final_block,
                 resnet_eps=1e-6,
                 resnet_act_fn=act_fn,