X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fmodules%2Favformat%2Fconsumer_avformat.c;h=4918a77ccd8682e5d665caeb6f31c967b60d5609;hb=8820b2068dee09af6b9ddb5ed078abbeeca5fdf2;hp=04cfde15147888fb1e80751ab60fffcdb6dcbc7c;hpb=d3c6dee05a6c0073d7dc687fb68cf5e79e00b1b2;p=melted

diff --git a/src/modules/avformat/consumer_avformat.c b/src/modules/avformat/consumer_avformat.c
index 04cfde1..4918a77 100644
--- a/src/modules/avformat/consumer_avformat.c
+++ b/src/modules/avformat/consumer_avformat.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
@@ -35,6 +35,9 @@
 
 // avformat header files
 #include <avformat.h>
+#ifdef SWSCALE
+#include <swscale.h>
+#endif
 
 //
 // This structure should be extended and made globally available in mlt
@@ -736,6 +739,32 @@ static void *consumer_thread( void *arg )
 	}
 
 	// Update the output context
+
+	// Write metadata
+	char *tmp = NULL;
+	int metavalue;
+
+	tmp = mlt_properties_get( properties, "meta.attr.title.markup");
+	if (tmp != NULL) snprintf( oc->title, sizeof(oc->title), "%s", tmp );
+
+	tmp = mlt_properties_get( properties, "meta.attr.comment.markup");
+	if (tmp != NULL) snprintf( oc->comment, sizeof(oc->comment), "%s", tmp );
+
+	tmp = mlt_properties_get( properties, "meta.attr.author.markup");
+	if (tmp != NULL) snprintf( oc->author, sizeof(oc->author), "%s", tmp );
+
+	tmp = mlt_properties_get( properties, "meta.attr.copyright.markup");
+	if (tmp != NULL) snprintf( oc->copyright, sizeof(oc->copyright), "%s", tmp );
+
+	tmp = mlt_properties_get( properties, "meta.attr.album.markup");
+	if (tmp != NULL) snprintf( oc->album, sizeof(oc->album), "%s", tmp );
+
+	metavalue = mlt_properties_get_int( properties, "meta.attr.year.markup");
+	if (metavalue != 0) oc->year = metavalue;
+
+	metavalue = mlt_properties_get_int( properties, "meta.attr.track.markup");
+	if (metavalue != 0) oc->track = metavalue;
+
 	oc->oformat = fmt;
 	snprintf( oc->filename, sizeof(oc->filename), "%s", filename );
 
@@ -913,7 +942,15 @@ static void *consumer_thread( void *arg )
 						}
 
 						// Do the colour space conversion
+#ifdef SWSCALE
+						struct SwsContext *context = sws_getContext( width, height, PIX_FMT_YUV422,
+							width, height, video_st->codec->pix_fmt, SWS_FAST_BILINEAR, NULL, NULL, NULL);
+						sws_scale( context, input->data, input->linesize, 0, height,
+							output->data, output->linesize);
+						sws_freeContext( context );
+#else
 						img_convert( ( AVPicture * )output, video_st->codec->pix_fmt, ( AVPicture * )input, PIX_FMT_YUV422, width, height );
+#endif
 
 						// Apply the alpha if applicable
 						if ( video_st->codec->pix_fmt == PIX_FMT_RGBA32 )