|
|
@ -1,30 +1,22 @@ |
|
|
|
# --- ROCK-COPYRIGHT-NOTE-BEGIN --- |
|
|
|
# |
|
|
|
# This copyright note is auto-generated by ./scripts/Create-CopyPatch. |
|
|
|
# Please add additional copyright information _after_ the line containing |
|
|
|
# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by |
|
|
|
# the ./scripts/Create-CopyPatch script. Do not edit this copyright text! |
|
|
|
# |
|
|
|
# ROCK Linux: rock-src/package/stf/x264/gpac.patch |
|
|
|
# ROCK Linux is Copyright (C) 1998 - 2006 Clifford Wolf |
|
|
|
# |
|
|
|
# This patch file is dual-licensed. It is available under the license the |
|
|
|
# patched project is licensed under, as long as it is an OpenSource license |
|
|
|
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or 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. |
|
|
|
# |
|
|
|
# --- ROCK-COPYRIGHT-NOTE-END --- |
|
|
|
|
|
|
|
--- ./configure.orig 2005-07-20 17:39:44.000000000 +0200
|
|
|
|
+++ ./configure 2005-09-13 00:58:55.000000000 +0200
|
|
|
|
@@ -158,7 +158,7 @@
|
|
|
|
;; |
|
|
|
--enable-mp4-output) |
|
|
|
CFLAGS="$CFLAGS -DMP4_OUTPUT" |
|
|
|
- LDFLAGS="$LDFLAGS -lm4systems_static"
|
|
|
|
+ LDFLAGS="$LDFLAGS -lm4systems"
|
|
|
|
if [ $SYS = CYGWIN -o $SYS = MINGW ]; then |
|
|
|
LDFLAGS="$LDFLAGS -lwinmm" |
|
|
|
fi |
|
|
|
--- ./configure.orig 2006-03-30 23:30:25.000000000 +0200
|
|
|
|
+++ ./configure 2006-03-30 23:30:40.000000000 +0200
|
|
|
|
@@ -290,7 +290,7 @@
|
|
|
|
esac |
|
|
|
fi |
|
|
|
|
|
|
|
-MP4_LDFLAGS="-lgpac_static"
|
|
|
|
+MP4_LDFLAGS="-lgpac"
|
|
|
|
if [ $SYS = CYGWIN -o $SYS = MINGW ]; then |
|
|
|
MP4_LDFLAGS="$MP4_LDFLAGS -lwinmm" |
|
|
|
fi |
|
|
|
--- ./muxers.c.orig 2006-03-30 23:39:03.000000000 +0200
|
|
|
|
+++ ./muxers.c 2006-03-30 23:39:15.000000000 +0200
|
|
|
|
@@ -647,7 +647,7 @@
|
|
|
|
return -1; |
|
|
|
|
|
|
|
memset(p_mp4, 0, sizeof(mp4_t)); |
|
|
|
- p_mp4->p_file = gf_isom_open(psz_filename, GF_ISOM_OPEN_WRITE, NULL);
|
|
|
|
+ p_mp4->p_file = gf_isom_open(psz_filename, GF_ISOM_OPEN_WRITE);
|
|
|
|
|
|
|
|
if ((p_mp4->p_sample = gf_isom_sample_new()) == NULL) |
|
|
|
{ |