Skip to content

V
vlc-2-2
Commit 13e4fe92 authored by Ilkka Ollakka's avatar Ilkka Ollakka
Browse files
Options

avcodec: set default channel layout on encoding

parent e42670fc
Hide whitespace changes
Inline Side-by-side
Showing with 7 additions and 0 deletions
modules/codec/avcodec/encoder.c
View file @ 13e4fe92
...@@ -46,6 +46,10 @@ ...@@ -46,6 +46,10 @@
#include "avcodec.h" #include "avcodec.h"
#include "avcommon.h" #include "avcommon.h"
#if LIBAVUTIL_VERSION_CHECK( 52,2,6,0,0 )
# include <libavutil/channel_layout.h>
#endif
#define HURRY_UP_GUARD1 (450000) #define HURRY_UP_GUARD1 (450000)
#define HURRY_UP_GUARD2 (300000) #define HURRY_UP_GUARD2 (300000)
#define HURRY_UP_GUARD3 (100000) #define HURRY_UP_GUARD3 (100000)
...@@ -635,6 +639,9 @@ int OpenEncoder( vlc_object_t *p_this ) ...@@ -635,6 +639,9 @@ int OpenEncoder( vlc_object_t *p_this )
p_context->time_base.num = 1; p_context->time_base.num = 1;
p_context->time_base.den = p_context->sample_rate; p_context->time_base.den = p_context->sample_rate;
p_context->channels = p_enc->fmt_out.audio.i_channels; p_context->channels = p_enc->fmt_out.audio.i_channels;
#if LIBAVUTIL_VERSION_CHECK( 52, 2, 6, 0, 0)
p_context->channel_layout = av_get_default_channel_layout( p_context->channels );
#endif
if ( p_enc->fmt_out.i_codec == VLC_CODEC_MP4A ) if ( p_enc->fmt_out.i_codec == VLC_CODEC_MP4A )
{ {
......
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