[FFmpeg-cvslog] ffmpeg: set resample_pix_fmt for sub2video.

Nicolas George git at videolan.org
Thu Feb 21 12:43:24 CET 2013


ffmpeg | branch: master | Nicolas George <nicolas.george at normalesup.org> | Sun Feb 17 13:09:43 2013 +0100| [9fa5a47197c6ef5489b04470b8369da33db40824] | committer: Nicolas George

ffmpeg: set resample_pix_fmt for sub2video.

Forgotten when the resample_* fields were added.
Fix assert failures.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9fa5a47197c6ef5489b04470b8369da33db40824
---

 ffmpeg_filter.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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)



More information about the ffmpeg-cvslog mailing list