Commit d06be22f authored by Damien Fouilleul's avatar Damien Fouilleul

libmp4: removed the 'France' option, who cares ?

parent 60a64110
......@@ -2055,16 +2055,8 @@ static int MP4_ReadBox_drms( stream_t *p_stream, MP4_Box_t *p_box )
if( p_drms_box && p_drms_box->data.p_sample_soun->p_drms )
{
int i_ret;
if( config_GetInt( p_stream, "france" ) )
{
i_ret = -7;
}
else
{
i_ret= drms_init( p_drms_box->data.p_sample_soun->p_drms,
int i_ret = drms_init( p_drms_box->data.p_sample_soun->p_drms,
p_box->i_type, p_peek, i_read );
}
if( i_ret )
{
const char *psz_error;
......@@ -2077,7 +2069,6 @@ static int MP4_ReadBox_drms( stream_t *p_stream, MP4_Box_t *p_box )
case -4: psz_error = "could not get SCI data"; break;
case -5: psz_error = "no user key found in SCI data"; break;
case -6: psz_error = "invalid user key"; break;
case -7: psz_error = "you live in France"; break;
default: psz_error = "unknown error"; break;
}
if MP4_BOX_TYPE_ASCII()
......
......@@ -521,10 +521,6 @@ static const char *ppsz_pos_descriptions[] =
"subsystem, such as the DVD or VCD device, the network interface " \
"settings or the subtitle channel.")
#define FRANCE_LONGTEXT N_( \
"If you live in France, it is not allowed to workaround any Digital " \
"Restrictions Management measure." )
#define CR_AVERAGE_TEXT N_("Clock reference average counter")
#define CR_AVERAGE_LONGTEXT N_( \
"When using the PVR input (or a very irregular source), you should " \
......@@ -1586,8 +1582,6 @@ vlc_module_begin();
set_category( CAT_INPUT );
set_subcategory( SUBCAT_INPUT_GENERAL );
add_bool( "france", VLC_FALSE, NULL, N_("France"), FRANCE_LONGTEXT, VLC_TRUE );
set_section( N_( "Track settings" ), NULL );
add_integer( "program", 0, NULL,
INPUT_PROGRAM_TEXT, INPUT_PROGRAM_LONGTEXT, VLC_TRUE );
......
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