vlc | branch: master | Konstantin Pavlov <[email protected]> | Tue Sep 20 18:02:10 2011 +0400| [64568cf4f09d85a8c39aeab165e6fefb50b878fa] | committer: Konstantin Pavlov
Revert "Switcher: port to FFmpeg-0.8 API" This reverts commit d0dc1be9481bcdb7d8e85cb1d19abfd934981b60. > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=64568cf4f09d85a8c39aeab165e6fefb50b878fa --- modules/stream_out/switcher.c | 41 +---------------------------------------- 1 files changed, 1 insertions(+), 40 deletions(-) diff --git a/modules/stream_out/switcher.c b/modules/stream_out/switcher.c index 0b48a71..ca57a28 100644 --- a/modules/stream_out/switcher.c +++ b/modules/stream_out/switcher.c @@ -358,7 +358,6 @@ static sout_stream_id_t *Add( sout_stream_t *p_stream, es_format_t *p_fmt ) /* Set CPU capabilities */ unsigned i_cpu = vlc_CPU(); id->ff_enc_c->dsp_mask = 0; -#if LIBAVCODEC_VERSION_MAJOR < 53 if( !(i_cpu & CPU_CAPABILITY_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 ) id->ff_enc_c->dsp_mask |= FF_MM_SSE; 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->channels = p_fmt->audio.i_channels; 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 ) /* Set CPU capabilities */ unsigned i_cpu = vlc_CPU(); id->ff_enc_c->dsp_mask = 0; -#if LIBAVCODEC_VERSION_MAJOR < 53 if( !(i_cpu & CPU_CAPABILITY_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 ) id->ff_enc_c->dsp_mask |= FF_MM_SSE; 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->height = p_sys->p_pictures[p_sys->i_cmd-1].format.i_height; _______________________________________________ vlc-commits mailing list [email protected] http://mailman.videolan.org/listinfo/vlc-commits
