diff options
| -rw-r--r-- | ChangeLog | 2 | ||||
| -rw-r--r-- | src/video_out/video_out_xxmc.c | 4 | ||||
| -rw-r--r-- | src/video_out/xxmc.h | 4 |
3 files changed, 6 insertions, 4 deletions
@@ -40,6 +40,8 @@ * use monotonic clock where available (eg. linux 2.6) so system clock updates won't disturb xine playback. [bug #781532] * fixed seeking unresponsiveness when using external subtitles + * Allowed multiple simultaneous thread access in parts of the xxmc driver, + assuming that XvMC libraries are thread-safe. xine-lib (1-rc6) * Moved win32 frontend into separate module. diff --git a/src/video_out/video_out_xxmc.c b/src/video_out/video_out_xxmc.c index 85240956b..f1d85b6ab 100644 --- a/src/video_out/video_out_xxmc.c +++ b/src/video_out/video_out_xxmc.c @@ -18,7 +18,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: video_out_xxmc.c,v 1.6 2004/10/14 23:03:18 miguelfreitas Exp $ + * $Id: video_out_xxmc.c,v 1.7 2004/10/30 15:12:49 totte67 Exp $ * * video_out_xxmc.c, X11 decoding accelerated video extension interface for xine * @@ -396,7 +396,7 @@ static void xxmc_duplicate_frame_data(vo_frame_t *this_gen, int need_dummy; xxmc = &orig->xxmc_data; - xvmc_context_writer_lock( &driver->xvmc_lock); + xvmc_context_reader_lock( &driver->xvmc_lock); if (!xxmc_xvmc_surface_valid(driver,orig->xvmc_surf)) { xvmc_context_reader_unlock( &driver->xvmc_lock ); return; diff --git a/src/video_out/xxmc.h b/src/video_out/xxmc.h index 568cc761e..234cd2fdb 100644 --- a/src/video_out/xxmc.h +++ b/src/video_out/xxmc.h @@ -18,7 +18,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: xxmc.h,v 1.3 2004/10/12 07:40:23 totte67 Exp $ + * $Id: xxmc.h,v 1.4 2004/10/30 15:12:49 totte67 Exp $ * * video_out_xxmc.c, X11 decoding accelerated video extension interface for xine * @@ -37,7 +37,7 @@ #ifndef _XXMC_H #define _XXMC_H -#undef XVMC_THREAD_SAFE +#define XVMC_THREAD_SAFE #ifdef HAVE_CONFIG_H #include "config.h" |