diff options
| author | jstebbins <[email protected]> | 2011-02-04 19:38:03 +0000 |
|---|---|---|
| committer | jstebbins <[email protected]> | 2011-02-04 19:38:03 +0000 |
| commit | 728d264fd8c930a61665839257b080784a6d186c (patch) | |
| tree | f2a60feaa208274def692782da57dbc1b98bee5e /libhb/sync.c | |
| parent | dbd2efd6fdd65e09e31f53214e18b5b117fb2cc0 (diff) | |
bump ffmpeg from svn 25689 to git 185a155
Fixes a couple h.264 decode issues
Fixes uft16-le chapter names in mov/mp4 files
Improved ac3 encoder
Numerous other bug fixes and improvements
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@3779 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'libhb/sync.c')
| -rw-r--r-- | libhb/sync.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libhb/sync.c b/libhb/sync.c index b44765e08..322dc783f 100644 --- a/libhb/sync.c +++ b/libhb/sync.c @@ -1154,6 +1154,7 @@ static void InitAudio( hb_job_t * job, hb_sync_common_t * common, int i ) c->bit_rate = w->audio->config.in.bitrate; c->sample_rate = w->audio->config.in.samplerate; c->channels = HB_INPUT_CH_LAYOUT_GET_DISCRETE_COUNT( w->audio->config.in.channel_layout ); + c->sample_fmt = AV_SAMPLE_FMT_FLT; if( hb_avcodec_open( c, codec ) < 0 ) { @@ -1162,7 +1163,7 @@ static void InitAudio( hb_job_t * job, hb_sync_common_t * common, int i ) } zeros = calloc( AC3_SAMPLES_PER_FRAME * - sizeof( short ) * c->channels, 1 ); + sizeof( float ) * c->channels, 1 ); sync->ac3_size = w->audio->config.in.bitrate * AC3_SAMPLES_PER_FRAME / w->audio->config.in.samplerate / 8; sync->ac3_buf = malloc( sync->ac3_size ); |