diff options
| author | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2011-12-21 23:37:04 +0000 |
|---|---|---|
| committer | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2011-12-21 23:37:04 +0000 |
| commit | bdb8abcdf99d455f3f29fce1a6e9b30052bc93a1 (patch) | |
| tree | 9a357059c3433584140c561c5c61421861181002 /src/xine-engine/osd.c | |
| parent | 57513400ce106f016e43c966900e5215d0304010 (diff) | |
| parent | a9a29bda1ddcec1ad8fa1305987a669404075c26 (diff) | |
| download | xine-lib-bdb8abcdf99d455f3f29fce1a6e9b30052bc93a1.tar.gz xine-lib-bdb8abcdf99d455f3f29fce1a6e9b30052bc93a1.tar.bz2 | |
Merge from 1.1.
--HG--
rename : src/libdts/xine_dts_decoder.c => src/audio_dec/xine_dts_decoder.c
rename : src/libxineadec/xine_lpcm_decoder.c => src/audio_dec/xine_lpcm_decoder.c
rename : src/combined/decoder_flac.c => src/combined/flac_decoder.c
rename : src/combined/demux_flac.c => src/combined/flac_demuxer.c
rename : src/libsputext/xine_sputext_decoder.c => src/spu_dec/sputext_decoder.c
Diffstat (limited to 'src/xine-engine/osd.c')
| -rw-r--r-- | src/xine-engine/osd.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/xine-engine/osd.c b/src/xine-engine/osd.c index c827607b1..423d72eb6 100644 --- a/src/xine-engine/osd.c +++ b/src/xine-engine/osd.c @@ -554,7 +554,7 @@ static int osd_hide (osd_object_t *osd, int64_t vpts) { this->stream->xine->port_ticket->release(this->stream->xine->port_ticket, 1); - return 1; + return ret; } |