generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
Instead print an error and continue

Fixes Ticket4702

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 6a1204a1a4)
This commit is contained in:
Michael Niedermayer
2015-07-08 02:43:02 +02:00
committed by Carl Eugen Hoyos
parent e0537e49a4
commit ada778c700
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libavformat/swfdec.c
View File

@@ -384,10 +384,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) { 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"); av_log(s, AV_LOG_ERROR, "pixel format change unsupported\n");
res = AVERROR_PATCHWELCOME; }else
goto bitmap_end; st->codec->pix_fmt = pix_fmt;
}
st->codec->pix_fmt = pix_fmt;
if (linesize * height > pkt->size) { if (linesize * height > pkt->size) {
res = AVERROR_INVALIDDATA; res = AVERROR_INVALIDDATA;