Fix reading binary files on Windows.

[mlt] / src / modules / core / filter_transition.c

diff --git a/src/modules/core/filter_transition.c b/src/modules/core/filter_transition.c
index bdd106aab592e49ff0d5e84ad32e98f525423628..5515d2360ad7d40921aefad0ecc1a54cda334590 100644 (file)
--- a/src/modules/core/filter_transition.c
+++ b/src/modules/core/filter_transition.c
@@ -3,22 +3,22 @@
  * Copyright (C) 2005 Ushodaya Enterprises Limited
  * Author: Charles Yates <charles.yates@pandora.be>
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
  *
- * This program is distributed in the hope that it will be useful,
+ * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "filter_transition.h"
+#include <framework/mlt_filter.h>
 #include <framework/mlt_factory.h>
 #include <framework/mlt_frame.h>
 #include <framework/mlt_transition.h>
@@ -39,7 +39,7 @@ static int filter_get_image( mlt_frame this, uint8_t **image, mlt_image_format *
        NB: Not all transitions will accept a and b frames being the same...
 */
 
-static int filter_get_audio( mlt_frame this, int16_t **buffer, mlt_audio_format *format, int *frequency, int *channels, int *samples )
+static int filter_get_audio( mlt_frame this, void **buffer, mlt_audio_format *format, int *frequency, int *channels, int *samples )
 {
        // Obtain the transition instance
        mlt_transition transition = mlt_frame_pop_audio( this );
@@ -59,7 +59,8 @@ static mlt_frame filter_process( mlt_filter this, mlt_frame frame )
        if ( transition == NULL )
        {
                char *name = mlt_properties_get( MLT_FILTER_PROPERTIES( this ), "transition" );
-               transition = mlt_factory_transition( name, NULL );
+               mlt_profile profile = mlt_service_profile( MLT_FILTER_SERVICE( this ) );
+               transition = mlt_factory_transition( profile, name, NULL );
                mlt_properties_set_data( MLT_FILTER_PROPERTIES( this ), "instance", transition, 0, ( mlt_destructor )mlt_transition_close, NULL );
        }
 
@@ -101,7 +102,7 @@ static mlt_frame filter_process( mlt_filter this, mlt_frame frame )
 /** Constructor for the filter.
 */
 
-mlt_filter filter_transition_init( char *arg )
+mlt_filter filter_transition_init( mlt_profile profile, mlt_service_type type, const char *id, char *arg )
 {
        mlt_filter this = mlt_filter_new( );
        if ( this != NULL )