Commit c4385514 authored by Vittorio Giovara's avatar Vittorio Giovara Committed by Rafaël Carré
Browse files

revert 062b8861



Such option is more suited to the avcodec-options field and should not be exposed to gui
Signed-off-by: Rafaël Carré's avatarRafaël Carré <funman@videolan.org>
parent a88f5170
......@@ -128,10 +128,6 @@ vlc_module_begin ()
SKIPLOOPF_LONGTEXT, false)
change_safe ()
change_integer_list( nloopf_list, nloopf_list_text )
#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT( 54, 41, 0 )
add_bool( "avcodec-ignorecrop", false, IGNORECROP_TEXT, IGNORECROP_LONGTEXT,
true )
#endif
add_obsolete_integer( "ffmpeg-debug" ) /* removed since 2.1.0 */
add_integer( "avcodec-debug", 0, DEBUG_TEXT, DEBUG_LONGTEXT,
......
......@@ -109,9 +109,6 @@ int ffmpeg_OpenCodec( decoder_t *p_dec );
"Force skipping of idct to speed up decoding for frame types " \
"(-1=None, 0=Default, 1=B-frames, 2=P-frames, 3=B+P frames, 4=all frames)." )
#define IGNORECROP_TEXT N_("Discard cropping information")
#define IGNORECROP_LONGTEXT N_("Discard internal cropping parameters (e.g. from H.264 SPS)." )
#define DEBUG_TEXT N_( "Debug mask" )
#define DEBUG_LONGTEXT N_( "Set FFmpeg debug mask" )
......
......@@ -237,11 +237,6 @@ int InitVideoDec( decoder_t *p_dec, AVCodecContext *p_context,
if( var_CreateGetBool( p_dec, "avcodec-fast" ) )
p_sys->p_context->flags2 |= CODEC_FLAG2_FAST;
#if LIBAVCODEC_VERSION_CHECK( 54, 41, 0, 91, 100 )
if( var_InheritBool( p_dec, "avcodec-ignorecrop" ) )
p_sys->p_context->flags2 |= CODEC_FLAG2_IGNORE_CROP;
#endif
/* ***** libavcodec frame skipping ***** */
p_sys->b_hurry_up = var_CreateGetBool( p_dec, "avcodec-hurry-up" );
......
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