summaryrefslogtreecommitdiffstats
path: root/libhb
diff options
context:
space:
mode:
authorkonablend <[email protected]>2009-06-02 17:31:09 +0000
committerkonablend <[email protected]>2009-06-02 17:31:09 +0000
commit9441e2cfde9537e00d5d192740bc7cf55b56d2b3 (patch)
treee903617680fc5dd0e6023d8aafff79fb0d0d955d /libhb
parentb1fcb3154f5c09a81e0cf712fad9d22f4e8e89bc (diff)
FFMPEG.
- bump ffmpeg from 0.5 (approx r17887) to r19067 (thanks van). - fixed latm patch; latmaac input no longer crashes. - removed P02-darwin-h264-dsp-crash. git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@2469 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'libhb')
-rw-r--r--libhb/hb.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/libhb/hb.c b/libhb/hb.c
index 9fdfe90f4..aa6679193 100644
--- a/libhb/hb.c
+++ b/libhb/hb.c
@@ -419,14 +419,14 @@ void hb_get_preview( hb_handle_t * h, hb_title_t * title, int picture,
buf1 = av_malloc( avpicture_get_size( PIX_FMT_YUV420P, title->width, title->height ) );
buf2 = av_malloc( avpicture_get_size( PIX_FMT_YUV420P, title->width, title->height ) );
buf3 = av_malloc( avpicture_get_size( PIX_FMT_YUV420P, rgb_width, job->height ) );
- buf4 = av_malloc( avpicture_get_size( PIX_FMT_RGBA32, rgb_width, job->height ) );
+ buf4 = av_malloc( avpicture_get_size( PIX_FMT_RGB32, rgb_width, job->height ) );
avpicture_fill( &pic_in, buf1, PIX_FMT_YUV420P,
title->width, title->height );
avpicture_fill( &pic_deint, buf2, PIX_FMT_YUV420P,
title->width, title->height );
avpicture_fill( &pic_scale, buf3, PIX_FMT_YUV420P,
rgb_width, job->height );
- avpicture_fill( &pic_preview, buf4, PIX_FMT_RGBA32,
+ avpicture_fill( &pic_preview, buf4, PIX_FMT_RGB32,
rgb_width, job->height );
// Allocate the AVPicture frames and fill in
@@ -476,7 +476,7 @@ void hb_get_preview( hb_handle_t * h, hb_title_t * title, int picture,
// Get preview context
context = sws_getContext(rgb_width, job->height, PIX_FMT_YUV420P,
- rgb_width, job->height, PIX_FMT_RGBA32,
+ rgb_width, job->height, PIX_FMT_RGB32,
swsflags, NULL, NULL, NULL);
// Create preview