Skip to content

V
vlc-2-2
Commit 64568cf4 authored by Konstantin Pavlov's avatar Konstantin Pavlov
Browse files
Options

Revert "Switcher: port to FFmpeg-0.8 API" 

This reverts commit d0dc1be9.
parent 2bb2c48e
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 40 deletions
modules/stream_out/switcher.c
View file @ 64568cf4
...@@ -358,7 +358,6 @@ static sout_stream_id_t *Add( sout_stream_t *p_stream, es_format_t *p_fmt ) ...@@ -358,7 +358,6 @@ static sout_stream_id_t *Add( sout_stream_t *p_stream, es_format_t *p_fmt )
/* Set CPU capabilities */ /* Set CPU capabilities */
unsigned i_cpu = vlc_CPU(); unsigned i_cpu = vlc_CPU();
id->ff_enc_c->dsp_mask = 0; id->ff_enc_c->dsp_mask = 0;
#if LIBAVCODEC_VERSION_MAJOR < 53
if( !(i_cpu & CPU_CAPABILITY_MMX) ) if( !(i_cpu & CPU_CAPABILITY_MMX) )
{ {
id->ff_enc_c->dsp_mask |= FF_MM_MMX; id->ff_enc_c->dsp_mask |= FF_MM_MMX;
...@@ -376,25 +375,7 @@ static sout_stream_id_t *Add( sout_stream_t *p_stream, es_format_t *p_fmt ) ...@@ -376,25 +375,7 @@ static sout_stream_id_t *Add( sout_stream_t *p_stream, es_format_t *p_fmt )
id->ff_enc_c->dsp_mask |= FF_MM_SSE; id->ff_enc_c->dsp_mask |= FF_MM_SSE;
id->ff_enc_c->dsp_mask |= FF_MM_SSE2; id->ff_enc_c->dsp_mask |= FF_MM_SSE2;
} }
#else
if( !(i_cpu & CPU_CAPABILITY_MMX) )
{
id->ff_enc_c->dsp_mask |= AV_CPU_FLAG_MMX;
}
if( !(i_cpu & CPU_CAPABILITY_MMXEXT) )
{
id->ff_enc_c->dsp_mask |= AV_CPU_FLAG_MMX2;
}
if( !(i_cpu & CPU_CAPABILITY_3DNOW) )
{
id->ff_enc_c->dsp_mask |= AV_CPU_FLAG_3DNOW;
}
if( !(i_cpu & CPU_CAPABILITY_SSE) )
{
id->ff_enc_c->dsp_mask |= AV_CPU_FLAG_SSE;
id->ff_enc_c->dsp_mask |= AV_CPU_FLAG_SSE2;
}
#endif
id->ff_enc_c->sample_rate = p_fmt->audio.i_rate; id->ff_enc_c->sample_rate = p_fmt->audio.i_rate;
id->ff_enc_c->channels = p_fmt->audio.i_channels; id->ff_enc_c->channels = p_fmt->audio.i_channels;
id->ff_enc_c->bit_rate = p_fmt->i_bitrate; id->ff_enc_c->bit_rate = p_fmt->i_bitrate;
...@@ -766,7 +747,6 @@ static mtime_t VideoCommand( sout_stream_t *p_stream, sout_stream_id_t *id ) ...@@ -766,7 +747,6 @@ static mtime_t VideoCommand( sout_stream_t *p_stream, sout_stream_id_t *id )
/* Set CPU capabilities */ /* Set CPU capabilities */
unsigned i_cpu = vlc_CPU(); unsigned i_cpu = vlc_CPU();
id->ff_enc_c->dsp_mask = 0; id->ff_enc_c->dsp_mask = 0;
#if LIBAVCODEC_VERSION_MAJOR < 53
if( !(i_cpu & CPU_CAPABILITY_MMX) ) if( !(i_cpu & CPU_CAPABILITY_MMX) )
{ {
id->ff_enc_c->dsp_mask |= FF_MM_MMX; id->ff_enc_c->dsp_mask |= FF_MM_MMX;
...@@ -784,25 +764,6 @@ static mtime_t VideoCommand( sout_stream_t *p_stream, sout_stream_id_t *id ) ...@@ -784,25 +764,6 @@ static mtime_t VideoCommand( sout_stream_t *p_stream, sout_stream_id_t *id )
id->ff_enc_c->dsp_mask |= FF_MM_SSE; id->ff_enc_c->dsp_mask |= FF_MM_SSE;
id->ff_enc_c->dsp_mask |= FF_MM_SSE2; id->ff_enc_c->dsp_mask |= FF_MM_SSE2;
} }
#else
if( !(i_cpu & CPU_CAPABILITY_MMX) )
{
id->ff_enc_c->dsp_mask |= AV_CPU_FLAG_MMX;
}
if( !(i_cpu & CPU_CAPABILITY_MMXEXT) )
{
id->ff_enc_c->dsp_mask |= AV_CPU_FLAG_MMX2;
}
if( !(i_cpu & CPU_CAPABILITY_3DNOW) )
{
id->ff_enc_c->dsp_mask |= AV_CPU_FLAG_3DNOW;
}
if( !(i_cpu & CPU_CAPABILITY_SSE) )
{
id->ff_enc_c->dsp_mask |= AV_CPU_FLAG_SSE;
id->ff_enc_c->dsp_mask |= AV_CPU_FLAG_SSE2;
}
#endif
id->ff_enc_c->width = p_sys->p_pictures[p_sys->i_cmd-1].format.i_width; id->ff_enc_c->width = p_sys->p_pictures[p_sys->i_cmd-1].format.i_width;
id->ff_enc_c->height = p_sys->p_pictures[p_sys->i_cmd-1].format.i_height; id->ff_enc_c->height = p_sys->p_pictures[p_sys->i_cmd-1].format.i_height;
......
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