diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-07-08 02:43:02 +0200 |
|---|---|---|
| committer | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2015-07-08 12:46:58 +0200 |
| commit | d9655621b3dc24ce04523f37ca6ab14b31f17245 (patch) | |
| tree | ece00213333fa0922a5a2f668d5a9a2bc8acec49 | |
| parent | 1a4cb3b29cdaa30b19a95e776fdd668dc0b66664 (diff) | |
| download | ffmpeg-d9655621b3dc24ce04523f37ca6ab14b31f17245.tar.gz | |
avformat/swfdec: Do not error out on pixel format changes
Instead print an error and continue
Fixes Ticket4702
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 6a1204a1a46674084b1e6b92562f81aaab7aac69)
| -rw-r--r-- | libavformat/swfdec.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/libavformat/swfdec.c b/libavformat/swfdec.c index 528bc236f2..b2c652eb9c 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; |