Changeset d06be22f8d23480e13129b312850a6c0caa3deee

Timestamp:

21/02/08 16:55:23 (8 months ago)

Author:

Damien Fouilleul <damienf@videolan.org>

git-committer:

Damien Fouilleul <damienf@videolan.org> 1203609323 +0000

git-parent:

[60a6411034db029a61b2c8cdc1d2a201143f2200]

git-author:

Damien Fouilleul <damienf@videolan.org> 1203609323 +0000

Message:

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

Files:

• modules/demux/mp4/libmp4.c (modified) (2 diffs)
• src/libvlc-module.c (modified) (2 diffs)

modules/demux/mp4/libmp4.c

@@ -2056 +2056 @@
-    if( p_drms_box && p_drms_box->data.p_sample_soun->p_drms )
-    {
-
-
-
-
-
-
-
-
+
-                               p_box->i_type, p_peek, i_read );
-        }
-        if( i_ret )
-        {
@@ -2078 +2070 @@
-                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;
-            }

src/libvlc-module.c

@@ -521 +521 @@
-    "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")
@@ -1586 +1582 @@
-    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 );