vlc.git
5 years agohelp: remove large but unchecked fixed-size buffer
Rémi Denis-Courmont [Wed, 20 Aug 2014 17:32:05 +0000 (20:32 +0300)]
help: remove large but unchecked fixed-size buffer

5 years agohelp: print the boolean default once and on a separate line
Rémi Denis-Courmont [Wed, 20 Aug 2014 17:09:02 +0000 (20:09 +0300)]
help: print the boolean default once and on a separate line

This avoids wrapping in the middle of it and having a parenthesis after
a full point.

5 years agoalsa: put pcm device back into running state after snd_pcm_recover() returned.
Jean-Paul Saman [Wed, 20 Aug 2014 11:59:35 +0000 (13:59 +0200)]
alsa: put pcm device back into running state after snd_pcm_recover() returned.

After recovery the pcm device can be in prepared state. To continue capturing data
the device must be put into running state again, hence the call to snd_pcm_start().

5 years agoalsa: do not leak memory on failure to read frames from pcm device.
Jean-Paul Saman [Wed, 20 Aug 2014 11:55:42 +0000 (13:55 +0200)]
alsa: do not leak memory on failure to read frames from pcm device.

5 years agoDTV: verbose frontend status
Rafaël Carré [Wed, 20 Aug 2014 10:01:27 +0000 (12:01 +0200)]
DTV: verbose frontend status

5 years agoDTV: remove unused variable
Rafaël Carré [Wed, 20 Aug 2014 09:54:54 +0000 (11:54 +0200)]
DTV: remove unused variable

5 years agoVNC: fix typo
Jean-Baptiste Kempf [Tue, 19 Aug 2014 23:54:59 +0000 (01:54 +0200)]
VNC: fix typo

5 years agomux: ogg: fix typo
Tristan Matthews [Tue, 19 Aug 2014 23:45:54 +0000 (16:45 -0700)]
mux: ogg: fix typo

5 years agoadjust: stick to single precision
Rémi Denis-Courmont [Tue, 19 Aug 2014 19:16:42 +0000 (22:16 +0300)]
adjust: stick to single precision

The VLC object variables are stored in single precision anyway.

5 years agoQt4: update hue scale (fixes #11997)
Rémi Denis-Courmont [Tue, 19 Aug 2014 19:07:48 +0000 (22:07 +0300)]
Qt4: update hue scale (fixes #11997)

5 years agovdpau: switch hue to float
Rémi Denis-Courmont [Tue, 19 Aug 2014 18:56:01 +0000 (21:56 +0300)]
vdpau: switch hue to float

5 years agoadjust: convert hue from [0..360] integer to [-180..+180] float
Rémi Denis-Courmont [Tue, 19 Aug 2014 18:38:41 +0000 (21:38 +0300)]
adjust: convert hue from [0..360] integer to [-180..+180] float

5 years agolib: allow setting float variables as integers
Rémi Denis-Courmont [Tue, 19 Aug 2014 18:44:08 +0000 (21:44 +0300)]
lib: allow setting float variables as integers

Just convert to/from float on the fly. That enables backward compatibility
for setting/getting adjust hue as an interger (next commit).

5 years agoDTV: fix CAM init
Rafaël Carré [Tue, 19 Aug 2014 10:08:05 +0000 (12:08 +0200)]
DTV: fix CAM init

5 years agoQt: fix focus on GotoTime dismiss
Ancelot Mark Pinto [Sun, 17 Aug 2014 13:30:37 +0000 (19:00 +0530)]
Qt: fix focus on GotoTime dismiss

Close #7914
returns highlight focus to main window on Go/Cancel/[Esc] in GotoTime dialogue

Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
5 years agocontrib: update aribb24 1.0.3
Naohiro KORIYAMA [Mon, 18 Aug 2014 15:43:48 +0000 (00:43 +0900)]
contrib: update aribb24 1.0.3

Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
5 years agomacosx: compilation fix for earlier clang releases and runtime fix for 10.6
Felix Paul Kühne [Mon, 18 Aug 2014 20:54:16 +0000 (22:54 +0200)]
macosx: compilation fix for earlier clang releases and runtime fix for 10.6

5 years agoavcapture: fix compilation for older clang releases
Felix Paul Kühne [Mon, 18 Aug 2014 20:45:19 +0000 (22:45 +0200)]
avcapture: fix compilation for older clang releases

5 years agocontrib/gpg-error: fix compilation for embedded 64bit Darwin platforms
Felix Paul Kühne [Sun, 17 Aug 2014 20:15:39 +0000 (22:15 +0200)]
contrib/gpg-error: fix compilation for embedded 64bit Darwin platforms

5 years agocontrib/sparkle: use version 1.6.1 since this is the last to support OS X 10.6
Felix Paul Kühne [Mon, 18 Aug 2014 18:22:32 +0000 (20:22 +0200)]
contrib/sparkle: use version 1.6.1 since this is the last to support OS X 10.6

Additionally, patch the sources slightly to support Xcode 4.2

5 years agozvbi: dead code
Rémi Denis-Courmont [Mon, 18 Aug 2014 18:13:05 +0000 (21:13 +0300)]
zvbi: dead code

5 years agotheora: tautology
Rémi Denis-Courmont [Mon, 18 Aug 2014 18:10:08 +0000 (21:10 +0300)]
theora: tautology

5 years agospeek: fix potential NULL dereference
Rémi Denis-Courmont [Mon, 18 Aug 2014 18:06:04 +0000 (21:06 +0300)]
speek: fix potential NULL dereference

5 years agomtp: pass error from lseek()
Rémi Denis-Courmont [Mon, 18 Aug 2014 18:00:50 +0000 (21:00 +0300)]
mtp: pass error from lseek()

5 years agofile: pass error from lseek()
Rémi Denis-Courmont [Mon, 18 Aug 2014 17:58:57 +0000 (20:58 +0300)]
file: pass error from lseek()

5 years agobluray: fix ToCToU between stat() and realpath()
Rémi Denis-Courmont [Mon, 18 Aug 2014 17:56:41 +0000 (20:56 +0300)]
bluray: fix ToCToU between stat() and realpath()

5 years agobluray: fix error handling
Rémi Denis-Courmont [Mon, 18 Aug 2014 17:50:32 +0000 (20:50 +0300)]
bluray: fix error handling

5 years agonetsync: check received packet sizes
Rémi Denis-Courmont [Mon, 18 Aug 2014 17:43:13 +0000 (20:43 +0300)]
netsync: check received packet sizes

5 years agodbus: fix timeout handling
Rémi Denis-Courmont [Mon, 18 Aug 2014 16:59:31 +0000 (19:59 +0300)]
dbus: fix timeout handling

 - Remove useless pointer back to DBusTimeout.
 - Fix memory error handling.
 - Fix race in accessing timer data.
 - Fix integer overflow.
 - Follow libdbus rules for retrieving time-out interval upon toggle.
 - Simplify expiration computations.

5 years agoDTV: open device nodes in non-blocking mode
Rémi Denis-Courmont [Mon, 18 Aug 2014 16:04:58 +0000 (19:04 +0300)]
DTV: open device nodes in non-blocking mode

5 years agoDVB: small simplification
Rémi Denis-Courmont [Mon, 18 Aug 2014 16:01:07 +0000 (19:01 +0300)]
DVB: small simplification

5 years agodemux: ts: fix unlikely leak (cid #1231839)
Francois Cartegnie [Mon, 18 Aug 2014 12:53:23 +0000 (21:53 +0900)]
demux: ts: fix unlikely leak (cid #1231839)

5 years agoaccess: dvdread: fix int overflow (cid #1062572)
Francois Cartegnie [Mon, 18 Aug 2014 12:43:04 +0000 (21:43 +0900)]
access: dvdread: fix int overflow (cid #1062572)

5 years agoaddons: fix deference before null check (cid #1231840)
Francois Cartegnie [Mon, 18 Aug 2014 12:35:14 +0000 (21:35 +0900)]
addons: fix deference before null check (cid #1231840)

5 years agoconfigure: correct GCC option for AltiVec
Rémi Denis-Courmont [Sun, 17 Aug 2014 15:19:38 +0000 (18:19 +0300)]
configure: correct GCC option for AltiVec

5 years agoconfigure: fix quoting
Rémi Denis-Courmont [Sun, 17 Aug 2014 15:18:31 +0000 (18:18 +0300)]
configure: fix quoting

5 years agoconfigure: typo
Rémi Denis-Courmont [Sun, 17 Aug 2014 15:17:08 +0000 (18:17 +0300)]
configure: typo

5 years agopoll: deal with invalid file descriptors more like specified
Rémi Denis-Courmont [Sun, 17 Aug 2014 13:28:36 +0000 (16:28 +0300)]
poll: deal with invalid file descriptors more like specified

5 years agoextras/tools: update gas-pp
Felix Paul Kühne [Sat, 16 Aug 2014 19:56:11 +0000 (21:56 +0200)]
extras/tools: update gas-pp

5 years agoBump plugin ABI
Rémi Denis-Courmont [Sun, 17 Aug 2014 07:32:07 +0000 (10:32 +0300)]
Bump plugin ABI

5 years agoCopy libtool library versions from 2.2.0
Rémi Denis-Courmont [Sun, 17 Aug 2014 07:22:19 +0000 (10:22 +0300)]
Copy libtool library versions from 2.2.0

5 years agoRDP: fix warning
Jean-Baptiste Kempf [Sun, 17 Aug 2014 06:20:29 +0000 (08:20 +0200)]
RDP: fix warning

5 years agoHTTP: remove unused variable
Jean-Baptiste Kempf [Sun, 17 Aug 2014 06:14:05 +0000 (08:14 +0200)]
HTTP: remove unused variable

5 years agoMKV: remove trailing spaces
Jean-Baptiste Kempf [Sun, 17 Aug 2014 06:05:25 +0000 (08:05 +0200)]
MKV: remove trailing spaces

5 years agogestures: fix callback leak and missing locking
Rémi Denis-Courmont [Sat, 16 Aug 2014 12:47:50 +0000 (15:47 +0300)]
gestures: fix callback leak and missing locking

5 years agonetsync: fix and simplify dead input handling (fixes #5426)
Rémi Denis-Courmont [Sat, 16 Aug 2014 12:42:21 +0000 (15:42 +0300)]
netsync: fix and simplify dead input handling (fixes #5426)

5 years agoplaylist: set "input-current" to NULL when appropriate
Rémi Denis-Courmont [Sat, 16 Aug 2014 12:31:25 +0000 (15:31 +0300)]
playlist: set "input-current" to NULL when appropriate

5 years agoHandle NULL value in "input-current" callback
Rémi Denis-Courmont [Sat, 16 Aug 2014 12:28:25 +0000 (15:28 +0300)]
Handle NULL value in "input-current" callback

5 years agomacosx: Do not resume playback if start, stop or run-time is set
David Fuhrmann [Sat, 16 Aug 2014 11:20:55 +0000 (13:20 +0200)]
macosx: Do not resume playback if start, stop or run-time is set

5 years agokeys: allow inverting positioning wheel (fixes #4748)
Rémi Denis-Courmont [Sat, 16 Aug 2014 11:11:47 +0000 (14:11 +0300)]
keys: allow inverting positioning wheel (fixes #4748)

5 years agodbus: fix file descriptors leak
Rémi Denis-Courmont [Sat, 16 Aug 2014 10:48:17 +0000 (13:48 +0300)]
dbus: fix file descriptors leak

5 years agodbus: register only one MPRIS bus name (fixes #10301)
Rémi Denis-Courmont [Sat, 16 Aug 2014 10:44:37 +0000 (13:44 +0300)]
dbus: register only one MPRIS bus name (fixes #10301)

5 years agodbus: register object path before bus names
Rémi Denis-Courmont [Sat, 16 Aug 2014 10:37:23 +0000 (13:37 +0300)]
dbus: register object path before bus names

This fixes a race condition where the player was visible on the bus
with the MPRIS name, but did not implement MPRIS.

5 years agonetsync: fix stale pointer on error
Rémi Denis-Courmont [Sat, 16 Aug 2014 10:11:09 +0000 (13:11 +0300)]
netsync: fix stale pointer on error

5 years agoplaylist: fix callback leak
Rémi Denis-Courmont [Sat, 16 Aug 2014 09:51:41 +0000 (12:51 +0300)]
playlist: fix callback leak

Note that we cannot hold the playlist lock while removing the callback,
since the callback function takes the playlist lock.

5 years agoplaylist: move i_nb_played to playlist item, not the input item
Rémi Denis-Courmont [Sat, 16 Aug 2014 10:04:33 +0000 (13:04 +0300)]
playlist: move i_nb_played to playlist item, not the input item

This is accessed with the playlock lock anyway.

5 years agoplaylist: do not copy string solely for debug
Rémi Denis-Courmont [Sat, 16 Aug 2014 09:45:11 +0000 (12:45 +0300)]
playlist: do not copy string solely for debug

5 years agodbus screensaver: fix description
Rémi Denis-Courmont [Sat, 16 Aug 2014 09:34:17 +0000 (12:34 +0300)]
dbus screensaver: fix description

5 years agoQt: update mouse wheel simple preferences (refs #5883)
Rémi Denis-Courmont [Sat, 16 Aug 2014 09:29:06 +0000 (12:29 +0300)]
Qt: update mouse wheel simple preferences (refs #5883)

5 years agokeys: separate config for each axis of the mouse wheel (fixes #5883)
Rémi Denis-Courmont [Sat, 16 Aug 2014 09:25:20 +0000 (12:25 +0300)]
keys: separate config for each axis of the mouse wheel (fixes #5883)

5 years agots: use timezone and fix thread-safety
Rémi Denis-Courmont [Sat, 16 Aug 2014 08:13:31 +0000 (11:13 +0300)]
ts: use timezone and fix thread-safety

5 years agoplaylist: remove unused return value
Rémi Denis-Courmont [Sat, 16 Aug 2014 08:14:48 +0000 (11:14 +0300)]
playlist: remove unused return value

5 years agooldrc: fix thread-cancellation on windows (fixes #10483)
Hannes Domani [Fri, 15 Aug 2014 20:50:48 +0000 (22:50 +0200)]
oldrc: fix thread-cancellation on windows (fixes #10483)

Signed-off-by: Rémi Denis-Courmont <remi@remlab.net>
5 years agoQt: stop abusing MACROS in extended_panels
Jean-Baptiste Kempf [Sat, 16 Aug 2014 07:00:24 +0000 (09:00 +0200)]
Qt: stop abusing MACROS in extended_panels

5 years agonotify: use proper cast to reduce warning
Jean-Baptiste Kempf [Sat, 16 Aug 2014 06:47:48 +0000 (08:47 +0200)]
notify: use proper cast to reduce warning

5 years agoNotify: fix compilation
Jean-Baptiste Kempf [Sat, 16 Aug 2014 06:44:59 +0000 (08:44 +0200)]
Notify: fix compilation

5 years agoos2: include vlc_input.h
KO Myung-Hun [Sat, 16 Aug 2014 06:32:33 +0000 (15:32 +0900)]
os2: include vlc_input.h

This fixes the following compilation error.

-----
  CC       os2/specific.lo
os2/specific.c: In function 'IPCHelperThread':
os2/specific.c:107:34: error: 'VLC_INPUT_OPTION_TRUSTED' undeclared (first use in this function)
                                  VLC_INPUT_OPTION_TRUSTED,
                                  ^
os2/specific.c:107:34: note: each undeclared identifier is reported only once for each function it appears in
-----

Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
5 years agodemux: ts: include time.h
KO Myung-Hun [Sat, 16 Aug 2014 06:32:50 +0000 (15:32 +0900)]
demux: ts: include time.h

This fixes the following compilation error.

-----
  CC       demux/libts_plugin_la-ts.lo
demux/ts.c: In function 'EITCallBack':
demux/ts.c:3114:13: error: implicit declaration of function 'time' [-Werror=implicit-function-declaration]
             time_t timer = time( NULL );
             ^
demux/ts.c:3115:13: error: implicit declaration of function 'difftime' [-Werror=implicit-function-declaration]
             int64_t diff = difftime( mktime( localtime( &timer ) ),
             ^
demux/ts.c:3115:13: error: implicit declaration of function 'mktime' [-Werror=implicit-function-declaration]
demux/ts.c:3115:13: error: implicit declaration of function 'localtime' [-Werror=implicit-function-declaration]
demux/ts.c:3116:38: error: implicit declaration of function 'gmtime' [-Werror=implicit-function-declaration]
                                      mktime( gmtime( &timer ) ) );
                                      ^
-----

Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
5 years agoadd rpath to LDFLAGS to build plugin properly
Naohiro KORIYAMA [Fri, 15 Aug 2014 08:06:16 +0000 (17:06 +0900)]
add rpath to LDFLAGS to build plugin properly

Signed-off-by: Francois Cartegnie <fcvlcdev@free.fr>
5 years agocontrib: update aribb24 1.0.2
Naohiro KORIYAMA [Fri, 15 Aug 2014 13:23:30 +0000 (22:23 +0900)]
contrib: update aribb24 1.0.2

Signed-off-by: Francois Cartegnie <fcvlcdev@free.fr>
5 years agoNEWS: forward port NEWS from 2.2.x and 2.1.5
Jean-Baptiste Kempf [Sat, 16 Aug 2014 00:39:27 +0000 (02:39 +0200)]
NEWS: forward port NEWS from 2.2.x and 2.1.5

5 years agoOSX growl: fix compilation
Jean-Baptiste Kempf [Fri, 15 Aug 2014 23:12:05 +0000 (01:12 +0200)]
OSX growl: fix compilation

5 years agoRemove vlc_input.h from vlc_playlist.h
Rémi Denis-Courmont [Fri, 15 Aug 2014 20:00:13 +0000 (23:00 +0300)]
Remove vlc_input.h from vlc_playlist.h

5 years agomedia_player: do not wait for input to stop when pausing (fixes #11767)
Rémi Denis-Courmont [Fri, 15 Aug 2014 18:47:44 +0000 (21:47 +0300)]
media_player: do not wait for input to stop when pausing (fixes #11767)

This lead to a deadlock when attempting to pause an input that did not
support pausing.

5 years agoinput: deduplicate code
Rémi Denis-Courmont [Fri, 15 Aug 2014 17:16:58 +0000 (20:16 +0300)]
input: deduplicate code

5 years agoinput: fetch demux attachment once, not twice (fixes #11966)
Rémi Denis-Courmont [Fri, 15 Aug 2014 17:07:07 +0000 (20:07 +0300)]
input: fetch demux attachment once, not twice (fixes #11966)

This was inefficient and caused attachments from the meta engine or from
the slave demuxers to get lost.

Note that those attachments will still get lost later if the master
demuxer sets the metadata update flag (which affects the Ogg demuxer
only so far), or when adding a slave input.

All regressions introduced in e4673369e8356c84ca99b66fb222dee07c8e4962.

5 years agometa: simplify input_ExtractAttachmentAndCacheArt()
Rémi Denis-Courmont [Fri, 15 Aug 2014 16:03:40 +0000 (19:03 +0300)]
meta: simplify input_ExtractAttachmentAndCacheArt()

Also improve error messages.

5 years agoinput item: attempt to clarify art URL merge
Rémi Denis-Courmont [Fri, 15 Aug 2014 15:51:57 +0000 (18:51 +0300)]
input item: attempt to clarify art URL merge

5 years agoinput item: simplify copying title from meta
Rémi Denis-Courmont [Fri, 15 Aug 2014 15:41:21 +0000 (18:41 +0300)]
input item: simplify copying title from meta

5 years agoinput item: remove b_fixed name, always false
Rémi Denis-Courmont [Fri, 15 Aug 2014 15:33:27 +0000 (18:33 +0300)]
input item: remove b_fixed name, always false

5 years agoplaylist demux: do not set empty art URL
Rémi Denis-Courmont [Fri, 15 Aug 2014 15:02:18 +0000 (18:02 +0300)]
playlist demux: do not set empty art URL

5 years agodemux: ts: support ARIB TOT and EIT running status
Francois Cartegnie [Fri, 15 Aug 2014 06:36:31 +0000 (15:36 +0900)]
demux: ts: support ARIB TOT and EIT running status

Signed-off-by: Francois Cartegnie <fcvlcdev@free.fr>
Fixed-by: Francois Cartegnie <fcvlcdev@free.fr>
5 years agoQt: epg: fix update signal
Francois Cartegnie [Fri, 15 Aug 2014 09:30:32 +0000 (18:30 +0900)]
Qt: epg: fix update signal

5 years agolivehttp: fixed generated iv in index file
Christian Suloway [Thu, 14 Aug 2014 22:55:35 +0000 (17:55 -0500)]
livehttp: fixed generated iv in index file

Removed extra shift when copying generated iv for output to index file tag

Signed-off-by: Rafaël Carré <funman@videolan.org>
5 years agoDTV: fix CAM build with httpd
Rafaël Carré [Thu, 14 Aug 2014 09:59:39 +0000 (11:59 +0200)]
DTV: fix CAM build with httpd

5 years agodemux: ts: return instead of abort()
Francois Cartegnie [Fri, 15 Aug 2014 09:02:42 +0000 (18:02 +0900)]
demux: ts: return instead of abort()

5 years agodemux: ts: add ARIB support
Naohiro KORIYAMA [Sat, 2 Aug 2014 01:31:18 +0000 (10:31 +0900)]
demux: ts: add ARIB support

Signed-off-by: Francois Cartegnie <fcvlcdev@free.fr>
Fixed-by: Francois Cartegnie <fcvlcdev@free.fr>
5 years agoQt: fix the postprocessing menu
Jean-Baptiste Kempf [Fri, 15 Aug 2014 07:26:25 +0000 (09:26 +0200)]
Qt: fix the postprocessing menu

Close #11613

5 years agoQt: create a AM::PPAction
Jean-Baptiste Kempf [Fri, 15 Aug 2014 07:25:22 +0000 (09:25 +0200)]
Qt: create a AM::PPAction

Ref #11613

5 years agoQt: PostProc getter helper
Jean-Baptiste Kempf [Fri, 15 Aug 2014 06:05:42 +0000 (08:05 +0200)]
Qt: PostProc getter helper

Ref #11613

5 years agoQt: PostProc setter helper
Jean-Baptiste Kempf [Fri, 15 Aug 2014 05:53:57 +0000 (07:53 +0200)]
Qt: PostProc setter helper

Ref #11613

5 years agoQt: helpers for setting video filter values
Jean-Baptiste Kempf [Fri, 15 Aug 2014 05:18:27 +0000 (07:18 +0200)]
Qt: helpers for setting video filter values

This is mostly splitting Qt and core code

Ref #11613

5 years agoQt: video filter helper for getting the filter type
Jean-Baptiste Kempf [Fri, 15 Aug 2014 05:53:47 +0000 (07:53 +0200)]
Qt: video filter helper for getting the filter type

Ref #11613

5 years agoWin32: rename crashdump to get only 1 bug report
Hannes Domani [Wed, 13 Aug 2014 18:09:20 +0000 (20:09 +0200)]
Win32: rename crashdump to get only 1 bug report

Close #8168

Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
5 years agoFix compilation when libARIB is missing
Jean-Baptiste Kempf [Fri, 15 Aug 2014 03:53:50 +0000 (05:53 +0200)]
Fix compilation when libARIB is missing

5 years agoQt: don't use a modal dialog for continuing the playback
Jean-Baptiste Kempf [Fri, 15 Aug 2014 03:44:30 +0000 (05:44 +0200)]
Qt: don't use a modal dialog for continuing the playback

Close #11705 #11703

5 years agocontribs: add libaribb24
Naohiro KORIYAMA [Sun, 10 Aug 2014 08:30:43 +0000 (17:30 +0900)]
contribs: add libaribb24

5 years agocodecs: add support for ARIB subtitles
Naohiro KORIYAMA [Sat, 23 Jun 2012 16:32:18 +0000 (01:32 +0900)]
codecs: add support for ARIB subtitles

Fixed-by: Francois Cartegnie <fcvlcdev@free.fr>
Signed-off-by: Francois Cartegnie <fcvlcdev@free.fr>
5 years agotext_renderer: use fontname in text_style_t
Naohiro KORIYAMA [Tue, 3 Jul 2012 09:00:11 +0000 (18:00 +0900)]
text_renderer: use fontname in text_style_t

Signed-off-by: Francois Cartegnie <fcvlcdev@free.fr>
5 years agofreetype: support kerning
Naohiro KORIYAMA [Sat, 23 Jun 2012 17:56:58 +0000 (02:56 +0900)]
freetype: support kerning

Signed-off-by: Francois Cartegnie <fcvlcdev@free.fr>