diff options
| author | Rodeo <[email protected]> | 2012-12-31 16:54:11 +0000 |
|---|---|---|
| committer | Rodeo <[email protected]> | 2012-12-31 16:54:11 +0000 |
| commit | 01d1b85d7adecdc588d5450ee43c52809c0b1c3f (patch) | |
| tree | 4f08f2381a18b4e62c4e5a82d7b610c68e8f1432 /libhb/scan.c | |
| parent | b96ca4f7de03e2c1b2d6865a0ae65798c1afed6f (diff) | |
Bump libav to v9_beta3.
Miscellaneous bugfixes and improvements.
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@5124 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'libhb/scan.c')
| -rw-r--r-- | libhb/scan.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/libhb/scan.c b/libhb/scan.c index 0163af406..49c092a1e 100644 --- a/libhb/scan.c +++ b/libhb/scan.c @@ -523,7 +523,7 @@ static int DecodePreviews( hb_scan_t * data, hb_title_t * title ) if (vcodec == WORK_DECMPEG2) { vcodec = WORK_DECAVCODECV; - title->video_codec_param = CODEC_ID_MPEG2VIDEO; + title->video_codec_param = AV_CODEC_ID_MPEG2VIDEO; } #endif hb_work_object_t *vid_decoder = hb_get_work( vcodec ); @@ -1035,11 +1035,12 @@ static void LookForAudio( hb_title_t * title, hb_buffer_t * b ) } else if (audio->config.in.channel_layout) { - int lfe = !!(audio->config.in.channel_layout & AV_CH_LOW_FREQUENCY); + int lfes = (!!(audio->config.in.channel_layout & AV_CH_LOW_FREQUENCY) + + !!(audio->config.in.channel_layout & AV_CH_LOW_FREQUENCY_2)); int channels = av_get_channel_layout_nb_channels(audio->config.in.channel_layout); char *desc = audio->config.lang.description + strlen(audio->config.lang.description); - sprintf(desc, " (%d.%d ch)", channels - lfe, lfe); + sprintf(desc, " (%d.%d ch)", channels - lfes, lfes); } hb_log( "scan: audio 0x%x: %s, rate=%dHz, bitrate=%d %s", audio->id, |