ffmpeg | branch: release/2.5 | Michael Niedermayer <michae...@gmx.at> | Wed Jul 8 02:43:02 2015 +0200| [51a624bb80b3a79b75c9a8b813f74da45365d646] | 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 <michae...@gmx.at> (cherry picked from commit 6a1204a1a46674084b1e6b92562f81aaab7aac69) > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=51a624bb80b3a79b75c9a8b813f74da45365d646 --- libavformat/swfdec.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/libavformat/swfdec.c b/libavformat/swfdec.c index 528bc23..b2c652e 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; _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
