replace legacy real_width and _height with meta.media.width and .height

[mlt] / src / modules / sdl / consumer_sdl_audio.c

diff --git a/src/modules/sdl/consumer_sdl_audio.c b/src/modules/sdl/consumer_sdl_audio.c
index 5c340d716676759e6dc1bce3bd56b0e7906adc27..59b651bd6338c39d1e46e536ac20e77b15697b5a 100644 (file)
--- a/src/modules/sdl/consumer_sdl_audio.c
+++ b/src/modules/sdl/consumer_sdl_audio.c
@@ -33,8 +33,6 @@
 
 extern pthread_mutex_t mlt_sdl_mutex;
 
-#define MIN(a,b) ((a) > (b) ? (b) : (a))
-
 /** This classes definition.
 */
 
@@ -230,7 +228,7 @@ static void sdl_fill_audio( void *udata, uint8_t *stream, int len )
        pthread_mutex_lock( &self->audio_mutex );
 
        // Block until audio received
-#ifndef WIN32
+#ifdef __DARWIN__
        while ( self->running && len > self->audio_avail )
                pthread_cond_wait( &self->audio_cond, &self->audio_mutex );
 #endif
@@ -255,7 +253,7 @@ static void sdl_fill_audio( void *udata, uint8_t *stream, int len )
                memset( stream, 0, len );
 
                // Mix the audio
-               SDL_MixAudio( stream, self->audio_buffer, MIN(len, self->audio_avail),
+               SDL_MixAudio( stream, self->audio_buffer, self->audio_avail,
                        ( int )( ( float )SDL_MIX_MAXVOLUME * volume ) );
 
                // No audio left