Merge commit 'f3b4a92241a33d444f7f6018ebc12e2e3a2d335f'

[ffmpeg] / libavformat / swfdec.c

diff --git a/libavformat/swfdec.c b/libavformat/swfdec.c
index d34d3d90dff46038c96d733429a23c72e7a75635..31c26f8bd443ea821e772952f3fc86a7cd72fbda 100644 (file)
--- a/libavformat/swfdec.c
+++ b/libavformat/swfdec.c
@@ -407,10 +407,8 @@ static int swf_read_packet(AVFormatContext *s, AVPacket *pkt)
             }
             if (st->codec->pix_fmt != AV_PIX_FMT_NONE && st->codec->pix_fmt != pix_fmt) {
                 av_log(s, AV_LOG_ERROR, "pixel format change unsupported\n");
-                res = AVERROR_PATCHWELCOME;
-                goto bitmap_end;
-            }
-            st->codec->pix_fmt = pix_fmt;
+            } else
+                st->codec->pix_fmt = pix_fmt;
 
             if (linesize * height > pkt->size) {
                 res = AVERROR_INVALIDDATA;