vlc | branch: master | Rémi Denis-Courmont <[email protected]> | Thu Sep 11 22:18:54 2014 +0300| [829aaabd6feea21c05308fe43eb23fc3a0cdecfd] | committer: Rémi Denis-Courmont
avcodec: remove deprecated motion vector visualization option > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=829aaabd6feea21c05308fe43eb23fc3a0cdecfd --- modules/codec/avcodec/avcodec.c | 5 ++--- modules/codec/avcodec/avcodec.h | 10 ---------- modules/codec/avcodec/video.c | 4 ---- 3 files changed, 2 insertions(+), 17 deletions(-) diff --git a/modules/codec/avcodec/avcodec.c b/modules/codec/avcodec/avcodec.c index 33a1b2f..6fd4ca6 100644 --- a/modules/codec/avcodec/avcodec.c +++ b/modules/codec/avcodec/avcodec.c @@ -111,9 +111,8 @@ vlc_module_begin () add_integer( "avcodec-skip-idct", 0, SKIP_IDCT_TEXT, SKIP_IDCT_LONGTEXT, true ) change_integer_range( -1, 4 ) - add_obsolete_integer ( "ffmpeg-vismv" ) /* removed since 2.1.0 */ - add_integer ( "avcodec-vismv", 0, VISMV_TEXT, VISMV_LONGTEXT, - true ) + add_obsolete_integer( "ffmpeg-vismv" ) /* removed since 2.1.0 */ + add_obsolete_integer( "avcodec-vismv" ) /* removed since 3.0.0 */ add_obsolete_integer ( "ffmpeg-lowres" ) /* removed since 2.1.0 */ add_obsolete_bool( "ffmpeg-fast" ) /* removed since 2.1.0 */ add_bool( "avcodec-fast", false, FAST_TEXT, FAST_LONGTEXT, false ) diff --git a/modules/codec/avcodec/avcodec.h b/modules/codec/avcodec/avcodec.h index 6156849..1928f46 100644 --- a/modules/codec/avcodec/avcodec.h +++ b/modules/codec/avcodec/avcodec.h @@ -111,16 +111,6 @@ int ffmpeg_OpenCodec( decoder_t *p_dec ); #define CODEC_TEXT N_( "Codec name" ) #define CODEC_LONGTEXT N_( "Internal libavcodec codec name" ) -/* TODO: Use a predefined list, with 0,1,2,4,7 */ -#define VISMV_TEXT N_( "Visualize motion vectors" ) -#define VISMV_LONGTEXT N_( \ - "You can overlay the motion vectors (arrows showing how the images move) "\ - "on the image. This value is a mask, based on these values:\n"\ - "1 - visualize forward predicted MVs of P frames\n" \ - "2 - visualize forward predicted MVs of B frames\n" \ - "4 - visualize backward predicted MVs of B frames\n" \ - "To visualize all vectors, the value should be 7." ) - #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 27d53f2..188dc53 100644 --- a/modules/codec/avcodec/video.c +++ b/modules/codec/avcodec/video.c @@ -297,10 +297,6 @@ int InitVideoDec( decoder_t *p_dec, AVCodecContext *p_context, p_context->flags |= CODEC_FLAG_OUTPUT_CORRUPT; #endif - i_val = var_CreateGetInteger( p_dec, "avcodec-vismv" ); - if( i_val ) - p_context->debug_mv = i_val; - i_val = var_CreateGetInteger( p_dec, "avcodec-skiploopfilter" ); if( i_val >= 4 ) p_context->skip_loop_filter = AVDISCARD_ALL; else if( i_val == 3 ) p_context->skip_loop_filter = AVDISCARD_NONKEY; _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
