Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (96047e1306969f8aa34ec951ab9566ab5bceb2ed)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Treeve Jelbert <scm AT mail.sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (96047e1306969f8aa34ec951ab9566ab5bceb2ed)
  • Date: Sun, 7 Jan 2007 09:42:52 -0600

GIT changes to master grimoire by Treeve Jelbert <treeve AT scarlet.be>:

video/transcode/HISTORY | 3 +
video/transcode/PRE_BUILD | 1
video/transcode/transcode-1.0.2-libmpeg3-1.7.patch | 45
+++++++++++++++++++++
3 files changed, 49 insertions(+)

New commits:
commit 96047e1306969f8aa34ec951ab9566ab5bceb2ed
Author: Treeve Jelbert <treeve AT scarlet.be>
Commit: Treeve Jelbert <treeve AT scarlet.be>

transcode - fix bug #13353

diff --git a/video/transcode/HISTORY b/video/transcode/HISTORY
index b5586b0..9a31efb 100644
--- a/video/transcode/HISTORY
+++ b/video/transcode/HISTORY
@@ -1,3 +1,6 @@
+2007-01-07 Treeve Jelbert <treeve01 AT pi.be>
+ * PRE_BUILD, transcode-1.0.2-libmpeg3-1.7.patch: fix bug #13353
+
2006-11-19 Arwed v. Merkatz <v.merkatz AT gmx.net>
* PRE_BUILD, 01_configure.dpatch: fix configure script to work with
ffmpeg-svn, bug #13207
diff --git a/video/transcode/PRE_BUILD b/video/transcode/PRE_BUILD
index b07dea4..2eeceb1 100755
--- a/video/transcode/PRE_BUILD
+++ b/video/transcode/PRE_BUILD
@@ -3,4 +3,5 @@ cd $SOURCE_DIRECTORY &&
patch -p0 < $SCRIPT_DIRECTORY/ffmpeg-api.patch &&
patch -p1 < $SCRIPT_DIRECTORY/03_imagemagick.dpatch &&
patch -p1 < $SCRIPT_DIRECTORY/01_configure.dpatch &&
+patch -p1 < $SCRIPT_DIRECTORY/transcode-1.0.2-libmpeg3-1.7.patch &&
sedit 's/-llzo/-llzo2/' configure
diff --git a/video/transcode/transcode-1.0.2-libmpeg3-1.7.patch
b/video/transcode/transcode-1.0.2-libmpeg3-1.7.patch
new file mode 100644
index 0000000..8a058af
--- /dev/null
+++ b/video/transcode/transcode-1.0.2-libmpeg3-1.7.patch
@@ -0,0 +1,45 @@
+--- transcode-1.0.2/import/import_mpeg3.c.orig 2006-09-09 23:39:08.598897708
+0200
++++ transcode-1.0.2/import/import_mpeg3.c 2006-09-09 23:40:36.455540042
+0200
+@@ -68,7 +68,7 @@
+ MOD_open
+ {
+
+- int i;
++ int i,return_value;
+
+ param->fd = NULL;
+
+@@ -79,14 +79,14 @@
+ if (param->flag == TC_VIDEO) {
+ if (!file) {
+ if (!file_a) {
+- if((file = mpeg3_open(vob->video_in_file))==NULL) {
++ if((file = mpeg3_open(vob->video_in_file,
&return_value))==NULL) {
+ fprintf(stderr, "open file failed\n");
+ return(TC_IMPORT_ERROR);
+ }
+ if (verbose & TC_DEBUG)
+ printf("[%s] Opened video NO copy\n", MOD_NAME);
+ } else if (file_a) {
+- if((file = mpeg3_open_copy(vob->video_in_file, file_a))==NULL) {
++ if((file = mpeg3_open_copy(vob->video_in_file, file_a,
&return_value))==NULL) {
+ fprintf(stderr, "open file failed\n");
+ return(TC_IMPORT_ERROR);
+ }
+@@ -98,14 +98,14 @@
+ if (param->flag == TC_AUDIO) {
+ if (!file_a) {
+ if (!file) {
+- if((file_a = mpeg3_open(vob->audio_in_file))==NULL) {
++ if((file_a = mpeg3_open(vob->audio_in_file,
&return_value))==NULL) {
+ fprintf(stderr, "open audio file failed\n");
+ return(TC_IMPORT_ERROR);
+ }
+ if (verbose & TC_DEBUG)
+ printf("[%s] Opened audio NO copy\n", MOD_NAME);
+ } else if (file) {
+- if((file_a = mpeg3_open_copy(vob->audio_in_file, file))==NULL) {
++ if((file_a = mpeg3_open_copy(vob->audio_in_file, file,
&return_value))==NULL) {
+ fprintf(stderr, "open_copy audio file failed\n");
+ return(TC_IMPORT_ERROR);
+ }



  • [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (96047e1306969f8aa34ec951ab9566ab5bceb2ed), Treeve Jelbert, 01/07/2007

Archive powered by MHonArc 2.6.24.

Top of Page