diff options
| author | jstebbins <[email protected]> | 2011-06-07 22:35:54 +0000 |
|---|---|---|
| committer | jstebbins <[email protected]> | 2011-06-07 22:35:54 +0000 |
| commit | 1e92c150aac42a8cd6e8c12b10494d9a1f42796e (patch) | |
| tree | 177523c63a4023a4393805358624af72e4e91bbb /libhb/encavcodecaudio.c | |
| parent | d40287132815adc74a0d1444a1e7b76e89879f69 (diff) | |
fix up usage of deprecated libav symbols and clean up patch fuzz
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@4030 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'libhb/encavcodecaudio.c')
| -rw-r--r-- | libhb/encavcodecaudio.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libhb/encavcodecaudio.c b/libhb/encavcodecaudio.c index a295dc368..3258ca042 100644 --- a/libhb/encavcodecaudio.c +++ b/libhb/encavcodecaudio.c @@ -105,7 +105,7 @@ static int encavcodecaInit( hb_work_object_t * w, hb_job_t * job ) // Set a reasonable maximum output size pv->output_bytes = context->frame_size * - (av_get_bits_per_sample_fmt(context->sample_fmt) / 8) * + av_get_bytes_per_sample(context->sample_fmt) * context->channels; pv->buf = malloc( pv->input_samples * sizeof( float ) ); @@ -206,8 +206,8 @@ static hb_buffer_t * Encode( hb_work_object_t * w ) int isamp, osamp; AVAudioConvert *ctx; - isamp = av_get_bits_per_sample_fmt( AV_SAMPLE_FMT_FLT ) / 8; - osamp = av_get_bits_per_sample_fmt( pv->context->sample_fmt ) / 8; + isamp = av_get_bytes_per_sample( AV_SAMPLE_FMT_FLT ); + osamp = av_get_bytes_per_sample( pv->context->sample_fmt ); ctx = av_audio_convert_alloc( pv->context->sample_fmt, 1, AV_SAMPLE_FMT_FLT, 1, NULL, 0 ); |