rpms/transcode/F-12 transcode-1.1.5-no_video.patch, NONE, 1.1 transcode.spec, 1.22, 1.23
Author: juran
Update of /cvs/free/rpms/transcode/F-12
In directory se02.es.rpmfusion.net:/tmp/cvs-serv14615
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-12/transcode.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- transcode.spec 7 Nov 2009 14:09:11 -0000 1.22
+++ transcode.spec 18 Feb 2010 17:15:51 -0000 1.23
@@ -7,7 +7,7 @@
Name: transcode
Version: 1.1.5
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Video stream processing tool
Group: Applications/Multimedia
@@ -16,7 +16,8 @@
Source0: http://prdownload.berlios.de/tcforge/%{name}-%{version}.tar.bz2
Patch0: %{name}-pvmbin.patch
Patch3: transcode-1.0.4.external_dv.patch
-Patch4: transcode-1.1.5-fix_v4l.patch
+Patch4: transcode-1.1.5-fix_v4l.patch
+Patch5: transcode-1.1.5-no_video.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -71,8 +72,8 @@
%setup -q
%patch0 -p1 -b .pvmbin
%patch3 -p1 -b .external_dv
-%patch4 -p1 -b .fix_v4l
-
+%patch4 -p1 -b .fix_v4l
+%patch5 -p1 -b .no_video
rm filter/preview/dv_types.h
rm import/v4l/videodev.h
@@ -150,6 +151,9 @@
%changelog
+* Sat Jan 30 2010 David Juran <david(a)juran.se> - 1.1.5-3
+- fix crash when using no video with the ogg exporter (Bz 1060)
+
* Sat Nov 7 2009 David Juran <david(a)juran.se> - 1.1.5-2
- explicitly (re-)enabled libmpeg2 support (Bz 922)