vlc | branch: master | Felix Paul Kühne <[email protected]> | Wed Mar 6 16:01:29 2013 +0100| [d32a6bc1d13d1fb641692eda83c2275e00cf4fda] | committer: Felix Paul Kühne
avcodec: remove 'lowres' option since it is ignored by libav > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=d32a6bc1d13d1fb641692eda83c2275e00cf4fda --- modules/codec/avcodec/avcodec.c | 3 --- modules/codec/avcodec/avcodec.h | 4 ---- modules/codec/avcodec/video.c | 3 --- 3 files changed, 10 deletions(-) diff --git a/modules/codec/avcodec/avcodec.c b/modules/codec/avcodec/avcodec.c index 456a4a9..bae7902 100644 --- a/modules/codec/avcodec/avcodec.c +++ b/modules/codec/avcodec/avcodec.c @@ -119,9 +119,6 @@ vlc_module_begin () add_integer ( "avcodec-vismv", 0, VISMV_TEXT, VISMV_LONGTEXT, true ) add_obsolete_integer ( "ffmpeg-lowres" ) /* removed since 2.1.0 */ - add_integer ( "avcodec-lowres", 0, LOWRES_TEXT, LOWRES_LONGTEXT, - true ) - change_integer_range( 0, 2 ) add_obsolete_bool( "ffmpeg-fast" ) /* removed since 2.1.0 */ add_bool( "avcodec-fast", false, FAST_TEXT, FAST_LONGTEXT, false ) add_obsolete_integer ( "ffmpeg-skiploopfilter" ) /* removed since 2.1.0 */ diff --git a/modules/codec/avcodec/avcodec.h b/modules/codec/avcodec/avcodec.h index 12b21d9..6a0fad2 100644 --- a/modules/codec/avcodec/avcodec.h +++ b/modules/codec/avcodec/avcodec.h @@ -129,10 +129,6 @@ int ffmpeg_OpenCodec( decoder_t *p_dec ); "4 - visualize backward predicted MVs of B frames\n" \ "To visualize all vectors, the value should be 7." ) -#define LOWRES_TEXT N_( "Low resolution decoding" ) -#define LOWRES_LONGTEXT N_( "Only decode a low resolution version of " \ - "the video. This requires less processing power" ) - #define SKIPLOOPF_TEXT N_( "Skip the loop filter for H.264 decoding" ) #define SKIPLOOPF_LONGTEXT N_( "Skipping the loop filter (aka deblocking) " \ "usually has a detrimental effect on quality. However it provides a big " \ diff --git a/modules/codec/avcodec/video.c b/modules/codec/avcodec/video.c index 062068f..637f397 100644 --- a/modules/codec/avcodec/video.c +++ b/modules/codec/avcodec/video.c @@ -225,9 +225,6 @@ int InitVideoDec( decoder_t *p_dec, AVCodecContext *p_context, i_val = var_CreateGetInteger( p_dec, "avcodec-vismv" ); if( i_val ) p_sys->p_context->debug_mv = i_val; - i_val = var_CreateGetInteger( p_dec, "avcodec-lowres" ); - if( i_val > 0 && i_val <= 2 ) p_sys->p_context->lowres = i_val; - i_val = var_CreateGetInteger( p_dec, "avcodec-skiploopfilter" ); if( i_val >= 4 ) p_sys->p_context->skip_loop_filter = AVDISCARD_ALL; else if( i_val == 3 ) p_sys->p_context->skip_loop_filter = AVDISCARD_NONKEY; _______________________________________________ vlc-commits mailing list [email protected] http://mailman.videolan.org/listinfo/vlc-commits
