summaryrefslogtreecommitdiff
authorNicolas George <nicolas.george@normalesup.org>2013-02-17 12:09:43 (GMT)
committer Nicolas George <nicolas.george@normalesup.org>2013-02-21 11:41:30 (GMT)
commit9fa5a47197c6ef5489b04470b8369da33db40824 (patch)
treeb6b23ba8e8adef70ddd876a633e52f5aa6c82ca9
parent01649c79c87cb8c12b2e7e5ab64b5ec4fd5e97ca (diff)
downloadffmpeg-9fa5a47197c6ef5489b04470b8369da33db40824.zip
ffmpeg-9fa5a47197c6ef5489b04470b8369da33db40824.tar.gz
ffmpeg-9fa5a47197c6ef5489b04470b8369da33db40824.tar.bz2
ffmpeg: set resample_pix_fmt for sub2video.
Forgotten when the resample_* fields were added. Fix assert failures.
Diffstat
-rw-r--r--ffmpeg_filter.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/ffmpeg_filter.c b/ffmpeg_filter.c
index e23e2eb..ac3e719 100644
--- a/ffmpeg_filter.c
+++ b/ffmpeg_filter.c
@@ -526,7 +526,7 @@ static int sub2video_prepare(InputStream *ist)
/* rectangles are AV_PIX_FMT_PAL8, but we have no guarantee that the
palettes for all rectangles are identical or compatible */
- ist->st->codec->pix_fmt = AV_PIX_FMT_RGB32;
+ ist->resample_pix_fmt = ist->st->codec->pix_fmt = AV_PIX_FMT_RGB32;
ret = av_image_alloc(image, linesize, w, h, AV_PIX_FMT_RGB32, 32);
if (ret < 0)