X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fmodules%2Fdv%2Fconsumer_libdv.c;h=f6c468e33715ca0e4544586ac62e402fb5f0a933;hb=40b169c095486ba1b868486eb98a47c41f36ce8c;hp=dbb817e2ed5bbdf91bedaf19e825d9f0e5eee1bc;hpb=efd5f25f6fe70f75f9787e9c7f2b53730ecf6048;p=melted

diff --git a/src/modules/dv/consumer_libdv.c b/src/modules/dv/consumer_libdv.c
index dbb817e..f6c468e 100644
--- a/src/modules/dv/consumer_libdv.c
+++ b/src/modules/dv/consumer_libdv.c
@@ -3,19 +3,19 @@
  * Copyright (C) 2003-2004 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
  */
 
 // Local header files
@@ -70,6 +70,9 @@ mlt_consumer consumer_libdv_init( char *arg )
 		mlt_properties_set_data( properties, "audio", consumer_encode_audio, 0, NULL, NULL );
 		mlt_properties_set_data( properties, "output", consumer_output, 0, NULL, NULL );
 
+		// Terminate at end of the stream by default
+		mlt_properties_set_int( properties, "terminate_on_pause", 1 );
+
 		// Set up start/stop/terminated callbacks
 		this->start = consumer_start;
 		this->stop = consumer_stop;
@@ -280,7 +283,7 @@ static void consumer_encode_audio( mlt_consumer this, uint8_t *dv_frame, mlt_fra
 		time_t start = time( NULL );
 		int height = mlt_properties_get_int( this_properties, "height" );
 		int is_pal = height == 576;
-		int is_wide = mlt_properties_get_int( this_properties, "display_ratio_num" ) == 16;
+		int is_wide = mlt_properties_get_int( this_properties, "display_aspect_num" ) == 16;
 
 		// Temporary - audio buffer allocation
 		int16_t *audio_buffers[ 4 ];