[FFmpeg-cvslog] avformat/swfdec: Do not error out on pixel format changes

[Michael Niedermayer]

ffmpeg | branch: release/2.2 | Michael Niedermayer <michaelni at gmx.at> | Wed Jul  8 02:43:02 2015 +0200| [b61ee9f03f19153abd99fd0d8879d253c0609300] | committer: Carl Eugen Hoyos

avformat/swfdec: Do not error out on pixel format changes

Instead print an error and continue

Fixes Ticket4702

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 6a1204a1a46674084b1e6b92562f81aaab7aac69)

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

 libavformat/swfdec.c |    6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/libavformat/swfdec.c b/libavformat/swfdec.c
index 91db06d..35c91df 100644
--- a/libavformat/swfdec.c
+++ b/libavformat/swfdec.c
@@ -390,10 +390,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;