Commit 78d87996 authored by Rémi Duraffort's avatar Rémi Duraffort

Merge branch '1.0-bugfix'

Conflicts:

	src/control/media_player.c
parents a4bcd514 b36b614a
......@@ -12553,7 +12553,7 @@ msgstr ""
"Este archivo AVI está roto. La búsqueda no funcionará correctamente.\n"
"¿Desea intentar repararlo?\n"
"\n"
"\vEsto puede tardar mucho."
"Esto puede tardar mucho."
#: modules/demux/avi/avi.c:688
msgid "Repair"
......
......@@ -1177,6 +1177,7 @@ libvlc_track_description_t *
if( val_list.p_list->i_count <= 0 ) /* no tracks */
{
var_FreeList( &val_list, &text_list);
vlc_object_release( p_input );
return NULL;
}
......
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