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/encavcodecaudio.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/encavcodecaudio.c')
| -rw-r--r-- | libhb/encavcodecaudio.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/libhb/encavcodecaudio.c b/libhb/encavcodecaudio.c index 8da52d8b8..db09e8a6f 100644 --- a/libhb/encavcodecaudio.c +++ b/libhb/encavcodecaudio.c @@ -66,11 +66,12 @@ static int encavcodecaInit(hb_work_object_t *w, hb_job_t *job) context->sample_rate = audio->config.out.samplerate; AVDictionary *av_opts = NULL; - if (w->codec_param == CODEC_ID_AAC) + if (w->codec_param == AV_CODEC_ID_AAC) { av_dict_set(&av_opts, "stereo_mode", "ms_off", 0); } - else if (w->codec_param == CODEC_ID_AC3 && mode != AV_MATRIX_ENCODING_NONE) + else if (w->codec_param == AV_CODEC_ID_AC3 && + mode != AV_MATRIX_ENCODING_NONE) { av_dict_set(&av_opts, "dsur_mode", "on", 0); } @@ -268,10 +269,10 @@ static hb_buffer_t* Encode(hb_work_object_t *w) av_samples_get_buffer_size(&in_linesize, pv->context->channels, frame.nb_samples, AV_SAMPLE_FMT_FLT, 1); int out_samples = avresample_convert(pv->avresample, - (void**)frame.extended_data, - out_linesize, frame.nb_samples, - (void**)&pv->input_buf, - in_linesize, frame.nb_samples); + frame.extended_data, out_linesize, + frame.nb_samples, + &pv->input_buf, in_linesize, + frame.nb_samples); if (out_samples != pv->samples_per_frame) { // we're not doing sample rate conversion, so this shouldn't happen |