← Back to branch summary

~ppsspp/ppsspp/ffmpeg-upstream

« back to all changes in this revision

Viewing changes to libavformat/swfdec.c

  • Committer: Sérgio Benjamim
  • Date: 2015-07-20 03:55:05 UTC
  • Revision ID: sergio_br2@yahoo.com.br-20150720035505-i1jj1zcjcnd0mc7w
Updated to 2.7.2.

Show diffs side-by-side

added added

removed removed

Lines of Context:
libavformat/swfdec.c
407
407
            }
408
408
            if (st->codec->pix_fmt != AV_PIX_FMT_NONE && st->codec->pix_fmt != pix_fmt) {
409
409
                av_log(s, AV_LOG_ERROR, "pixel format change unsupported\n");
410
 
                res = AVERROR_PATCHWELCOME;
411
 
                goto bitmap_end;
412
 
            }
413
 
            st->codec->pix_fmt = pix_fmt;
 
410
            }else
 
411
                st->codec->pix_fmt = pix_fmt;
414
412
 
415
413
            if (linesize * height > pkt->size) {
416
414
                res = AVERROR_INVALIDDATA;