rpms/transcode/F-11 transcode-1.1.5-no_video.patch, NONE, 1.1 transcode.spec, 1.15, 1.16

[David Juran]

Author: juran

Update of /cvs/free/rpms/transcode/F-11
In directory se02.es.rpmfusion.net:/tmp/cvs-serv16141

Modified Files:
	transcode.spec 
Added Files:
	transcode-1.1.5-no_video.patch 
Log Message:
- fix crash when using no video with the ogg exporter (Bz 1060)


transcode-1.1.5-no_video.patch:
 export_ogg.c |   14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

--- NEW FILE transcode-1.1.5-no_video.patch ---
diff -up transcode-1.1.5/export/export_ogg.c.no_video transcode-1.1.5/export/export_ogg.c
--- transcode-1.1.5/export/export_ogg.c.no_video	2010-01-30 19:05:38.000000000 +0200
+++ transcode-1.1.5/export/export_ogg.c	2010-01-30 19:05:59.000000000 +0200
@@ -89,8 +89,9 @@ MOD_open
 	    return(TC_EXPORT_ERROR);
 	}
 
-	if (!strcmp(vob->video_out_file, vob->audio_out_file)) {
-	    tc_log_info(MOD_NAME, "Writing audio to \"/dev/null\" (no -m option)");
+	if (vob->video_out_file && 
+	    !strcmp(vob->video_out_file, vob->audio_out_file)) {
+	  tc_log_info(MOD_NAME, "Writing audio to \"/dev/null\" (no -m option)");
 	}
 	if (vob->mp3bitrate == 0)
 	    result = tc_snprintf (buf, PATH_MAX, "oggenc -r -B %d -C %d -q %.2f %s -Q -o \"%s\" %s -",
@@ -214,10 +215,11 @@ MOD_close
 	pFile = NULL;
 
 	if (verbose > 0 && strcmp (vob->audio_out_file, "/dev/null") &&
-		strcmp (vob->video_out_file, "/dev/null")!=0) {
-	    tc_log_info (MOD_NAME, "Hint: Now merge the files with");
-	    tc_log_info (MOD_NAME, "Hint: ogmmerge -o complete.ogg %s %s",
-			 vob->video_out_file, vob->audio_out_file );
+	    vob->video_out_file &&
+	    strcmp (vob->video_out_file, "/dev/null")!=0) {
+	  tc_log_info (MOD_NAME, "Hint: Now merge the files with");
+	  tc_log_info (MOD_NAME, "Hint: ogmmerge -o complete.ogg %s %s",
+		       vob->video_out_file, vob->audio_out_file );
 	}
 
         return(0);


Index: transcode.spec
===================================================================
RCS file: /cvs/free/rpms/transcode/F-11/transcode.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- transcode.spec	4 Jul 2009 21:55:10 -0000	1.15
+++ transcode.spec	18 Feb 2010 17:30:41 -0000	1.16
@@ -7,7 +7,7 @@
 
 Name:           transcode
 Version:        1.1.1
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Video stream processing tool
 
 Group:          Applications/Multimedia
@@ -17,6 +17,7 @@
 Patch0:         %{name}-pvmbin.patch
 Patch3:         transcode-1.0.4.external_dv.patch
 Patch4:		transcode-1.1.1-textrel.patch
+Patch5:	 transcode-1.1.5-no_video.patch	
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -69,6 +70,8 @@
 %patch0 -p1 -b .pvmbin
 %patch3 -p1 -b .external_dv
 %patch4 -p1 -b .textrel
+%patch5 -p1 -b .no_video
+
 rm filter/preview/dv_types.h
 rm import/v4l/videodev.h
 rm import/v4l/videodev2.h
@@ -138,6 +141,9 @@
 
 
 %changelog
+* Sat Jan 30 2010 David Juran <david at juran.se> - 1.1.1-7
+- fix crash when using no video with the ogg exporter (Bz 1060)
+
 * Sat Jul  4 2009 David Juran <david at juran.se> - 1.1.1-6
 - Fix TEXTREL (Bz 658)
 - Update URL