revert 062b886122287d8ad3ec93b3faa59808d2b1e9c7

Such option is more suited to the avcodec-options field and should not be exposed to gui

Signed-off-by: Rafaël Carré <funman@videolan.org>

diff --git a/modules/codec/avcodec/avcodec.c b/modules/codec/avcodec/avcodec.c
index d85a2ea7e63b1ddd7867118832e8a35c9e254048..4efafd4d73fd0c5a4cfa1112c3f37122713ca825 100644 (file)
--- a/modules/codec/avcodec/avcodec.c
+++ b/modules/codec/avcodec/avcodec.c
@@ -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,

diff --git a/modules/codec/avcodec/avcodec.h b/modules/codec/avcodec/avcodec.h
index b8b77c0d5f3136df6202c7e2c9059be61247291d..7551ab55b6396d95c1e6f24d3016126188321278 100644 (file)
--- a/modules/codec/avcodec/avcodec.h
+++ b/modules/codec/avcodec/avcodec.h
@@ -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" )
 

diff --git a/modules/codec/avcodec/video.c b/modules/codec/avcodec/video.c
index f27fbe4ec68f34b096c8a3a6e4db5f84c82a4587..cd41fe10274f5c84f62204199f2fbe586c38fafa 100644 (file)
--- a/modules/codec/avcodec/video.c
+++ b/modules/codec/avcodec/video.c
@@ -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" );