Commit 3a6f1b59 authored by Antoine Cellerier's avatar Antoine Cellerier

Cosmetics.

parent b26f5a25
...@@ -237,7 +237,7 @@ int OpenEncoder( vlc_object_t *p_this ) ...@@ -237,7 +237,7 @@ int OpenEncoder( vlc_object_t *p_this )
} }
/* Initialization must be done before avcodec_find_encoder() */ /* Initialization must be done before avcodec_find_encoder() */
InitLibavcodec(p_this); InitLibavcodec( p_this );
p_codec = avcodec_find_encoder( i_codec_id ); p_codec = avcodec_find_encoder( i_codec_id );
if( !p_codec ) if( !p_codec )
...@@ -529,8 +529,8 @@ int OpenEncoder( vlc_object_t *p_this ) ...@@ -529,8 +529,8 @@ int OpenEncoder( vlc_object_t *p_this )
if( p_sys->i_vtolerance > 0 ) if( p_sys->i_vtolerance > 0 )
p_context->bit_rate_tolerance = p_sys->i_vtolerance; p_context->bit_rate_tolerance = p_sys->i_vtolerance;
/* usually if someone sets bitrate, he likes more to get that bitrate over quality /* usually if someone sets bitrate, he likes more to get that bitrate
* should help 'normal' user to get asked bitrate * over quality should help 'normal' user to get asked bitrate
*/ */
if( p_enc->fmt_out.i_bitrate > 0 && p_sys->i_qmax == 0 && p_sys->i_qmin == 0 ) if( p_enc->fmt_out.i_bitrate > 0 && p_sys->i_qmax == 0 && p_sys->i_qmin == 0 )
{ {
...@@ -655,7 +655,8 @@ int OpenEncoder( vlc_object_t *p_this ) ...@@ -655,7 +655,8 @@ int OpenEncoder( vlc_object_t *p_this )
{ {
vlc_mutex_unlock( lock ); vlc_mutex_unlock( lock );
msg_Err( p_enc, "cannot open encoder" ); msg_Err( p_enc, "cannot open encoder" );
intf_UserFatal( p_enc, false, _("Streaming / Transcoding failed"), intf_UserFatal( p_enc, false,
_("Streaming / Transcoding failed"),
_("VLC could not open the encoder.") ); _("VLC could not open the encoder.") );
free( p_sys ); free( p_sys );
return VLC_EGENERIC; return VLC_EGENERIC;
...@@ -1021,7 +1022,8 @@ static block_t *EncodeAudio( encoder_t *p_enc, aout_buffer_t *p_aout_buf ) ...@@ -1021,7 +1022,8 @@ static block_t *EncodeAudio( encoder_t *p_enc, aout_buffer_t *p_aout_buf )
p_samples = (int16_t *)p_buffer; p_samples = (int16_t *)p_buffer;
} }
i_out = avcodec_encode_audio( p_sys->p_context, (uint8_t *)p_sys->p_buffer_out, i_out = avcodec_encode_audio( p_sys->p_context,
(uint8_t *)p_sys->p_buffer_out,
2 * AVCODEC_MAX_AUDIO_FRAME_SIZE, 2 * AVCODEC_MAX_AUDIO_FRAME_SIZE,
p_samples ); p_samples );
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment