Browse Source

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 6a1204a1a4)
tags/n2.4.11
Michael Niedermayer Carl Eugen Hoyos 10 years ago
parent
commit
d9655621b3
1 changed files with 2 additions and 4 deletions
  1. +2
    -4
      libavformat/swfdec.c

+ 2
- 4
libavformat/swfdec.c View File

@@ -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;


Loading…
Cancel
Save