m2vmp2cut-0.84/ANNOUNCEm2vmp2cut-0.86/ANNOUNCE
@@ -1,5 +1,5 @@
11
2m2vmp2cut 0.842m2vmp2cut 0.86
33
4This is stable release of m2vmp2cut -- frame accurate (currently PAL)4This is stable release of m2vmp2cut -- frame accurate (currently PAL)
5mpeg2 video (m2v file) with accompanied mp2 audio (mp2 file) cutter.5mpeg2 video (m2v file) with accompanied mp2 audio (mp2 file) cutter.
m2vmp2cut-0.84/bin/m2vmp2cut.shm2vmp2cut-0.86/bin/m2vmp2cut.sh
@@ -7,7 +7,7 @@
7# All rights reserved7# All rights reserved
8#8#
9# Created: Wed Apr 23 21:40:17 EEST 2008 too9# Created: Wed Apr 23 21:40:17 EEST 2008 too
10# Last modified: Fri 12 Oct 2012 16:47:06 EEST too10# Last modified: Thu 18 Oct 2012 17:53:10 EEST too
1111
12set -eu12set -eu
13case ${1-} in -x) set -x; shift; esac # debug help, passed thru wrapper.13case ${1-} in -x) set -x; shift; esac # debug help, passed thru wrapper.

@@ -117,8 +117,17 @@
117 then die "Directory '$dir' is on the way (demuxed already)?"117 then die "Directory '$dir' is on the way (demuxed already)?"
118 fi118 fi
119 mkdir "$dir"119 mkdir "$dir"
120 # for future use, perhaps...
121 echo 'SubtitlePanel.SubtitleExportFormat=SRT' > "$dir"/X.ini
122 echo 'SubtitlePanel.SubtitleExportFormat_2=SON' >> "$dir"/X.ini
123 echo 'SubtitlePanel.exportAsVobSub=1' >> "$dir"/X.ini
120 x $pjx -ini /dev/null -out "$dir" -name in "$file" "$@"124 x $pjx -ini "$dir"/X.ini -out "$dir" -name in "$file" "$@"
121 cd "$dir"125 cd "$dir"
126 if test -f in.son
127 then
128 mkdir in_sp
129 mv *.son *.sup *.sup.* *.spf *.bmp in_sp 2>/dev/null || :
130 fi
122131
123# ac3=`ls *.ac3 2>/dev/null`132# ac3=`ls *.ac3 2>/dev/null`
124 mp2=`ls *.mp2 2>/dev/null`133 mp2=`ls *.mp2 2>/dev/null`
m2vmp2cut-0.84/Makefilem2vmp2cut-0.86/Makefile
@@ -5,13 +5,22 @@
5.SUFFIXES:5.SUFFIXES:
66
7all: ALWAYS7all: ALWAYS
8 cd src && make all8 make -C src all
9 @echo; echo Build done.; echo9 @echo; echo Build done.; echo
1010
11# From command line to subproceses...11# From command line to subproceses...
12DESTDIR =
13export DESTDIR
14PREFIX =
12export PREFIX15export PREFIX
16LIBEXECDIR =
17export LIBEXECDIR
18DATAROOTDIR =
19export DATAROOTDIR
20PJXJAR =
13export PJXJAR21export PJXJAR
22
1423
15TRG_BINS = m2vcut-gui m2vfilter m2vscan m2vtoyuv mp2cutpoints \24TRG_BINS = m2vcut-gui m2vfilter m2vscan m2vtoyuv mp2cutpoints \
16 fileparts filerotate textdisp \25 fileparts filerotate textdisp \
17 libpreload_ffm2vtoyuv4mpeghax.so \26 libpreload_ffm2vtoyuv4mpeghax.so \
m2vmp2cut-0.84/makehelperm2vmp2cut-0.86/makehelper
@@ -24,13 +24,6 @@
24 return 024 return 0
25}
26
27mkmissingdirs ()
28{
29 for d
30 do test -d "$d" || x mkdir -m 755 "$d"
31 done
32}25}
3326
34getcmds ()27getcmds ()
35{28{
36 cmds=`env which projectx java mplex 2>/dev/null | tr '\012' :`29 cmds=`env which projectx java mplex 2>/dev/null | tr '\012' :`

@@ -62,7 +55,7 @@
62 }55 }
6356
64 getcmds57 getcmds
65 needcmd mplex needed for remuxing after cut.58 needcmd mplex needed for remuxing after cut
66 if needvar PJXVAR59 if needvar PJXVAR
67 then60 then
68 case $PJXJAR in /*) ;;61 case $PJXJAR in /*) ;;

@@ -89,36 +82,55 @@
89 fi82 fi
90 esac83 esac
9184
85 if ne "${LIBEXECDIR-}" ''
86 then
87 needvar LIBEXECDIR # variable content check (spaces...)
88 else
89 LIBEXECDIR=$PREFIX/lib/m2vmp2cut-$VERSION
90 fi
91
92 if ne "${DATAROOTDIR-}" ''
93 then
94 needvar DATAROOTDIR # variable content check (spaces...)
95 DOCDIR=$DATAROOTDIR/doc/m2vmp2cut-$VERSION
96 else
97 DOCDIR=$LIBEXECDIR/doc
98 fi
99
100 D_PREFIX=${DESTDIR-}$PREFIX
101 D_LIBEXECDIR=${DESTDIR-}$LIBEXECDIR
102 D_DOCDIR=${DESTDIR-}$DOCDIR
103
92 echo; echo Begin installation.; echo104 echo; echo Begin installation.; echo
93 rm -rf $PREFIX/lib/m2vmp2cut-$VERSION105 rm -rf "$D_LIBEXECDIR"
94 x mkdir -m 755 -p $PREFIX106 x mkdir -m 755 -p "$D_LIBEXECDIR"
107 test -d "$D_PREFIX" || x mkdir -m 755 -p "$D_PREFIX"
95108
109 test -d "$D_PREFIX"/bin || x mkdir -m 755 "$D_PREFIX"/bin
110 x mkdir -m 755 "$D_LIBEXECDIR"/bin "$D_LIBEXECDIR"/contrib
96 rm -rf $PREFIX/lib/m2vmp2cut-$VERSION
97 mkmissingdirs $PREFIX/lib $PREFIX/lib/m2vmp2cut-$VERSION
98 mkmissingdirs $PREFIX/lib/m2vmp2cut-$VERSION/bin
99 mkmissingdirs $PREFIX/lib/m2vmp2cut-$VERSION/doc
100 mkmissingdirs $PREFIX/lib/m2vmp2cut-$VERSION/contrib
101 mkmissingdirs $PREFIX/bin
102111
103 x cp $1 $PREFIX/lib/m2vmp2cut-$VERSION/bin112 x mkdir -m 755 -p "$D_DOCDIR" # no test as docdir seldom exists...
104 x cp $2 $PREFIX/lib/m2vmp2cut-$VERSION/doc113 test -d "$D_LIBEXECDIR"/doc || x ln -s "$DOCDIR" "$D_LIBEXECDIR"/doc
105 x cp contrib/* $PREFIX/lib/m2vmp2cut-$VERSION/contrib114
106 exec 3> $PREFIX/bin/m2vmp2cut.wip115 x cp $1 "$D_LIBEXECDIR"/bin
116 x cp $2 "$D_DOCDIR"
117 x cp contrib/* "$D_LIBEXECDIR"/contrib
107 case $VERSION in wip) verinfo="$VERSION (installed `date +%Y-%m-%d`)"118 case $VERSION in wip) verinfo="$VERSION (installed `date +%Y-%m-%d`)"
108 ;; *) verinfo=$VERSION119 ;; *) verinfo=$VERSION
109 esac120 esac
121 exec 3> "$D_PREFIX"/bin/m2vmp2cut.wip
110 echo '#!/bin/sh' >&3122 echo '#!/bin/sh' >&3
111 echo 'case ${1-} in'" '') echo; echo 'm2vmp2cut version $verinfo'" >&3123 echo 'case ${1-} in'" '') echo; echo 'm2vmp2cut version $verinfo'" >&3
112 echo 'esac' >&3124 echo 'esac' >&3
113 echo "exec $PREFIX/lib/m2vmp2cut-$VERSION/bin/m2vmp2cut.sh"' "$@"' >&3125 echo "exec $LIBEXECDIR/bin/m2vmp2cut.sh"' "$@"' >&3
114 exec 3>&-126 exec 3>&-
115 chmod 755 $PREFIX/bin/m2vmp2cut.wip127 chmod 755 "$D_PREFIX"/bin/m2vmp2cut.wip
116 mv $PREFIX/bin/m2vmp2cut.wip $PREFIX/bin/m2vmp2cut128 mv "$D_PREFIX"/bin/m2vmp2cut.wip "$D_PREFIX"/bin/m2vmp2cut
117 echo wrote $PREFIX/bin/m2vmp2cut129 echo wrote $PREFIX/bin/m2vmp2cut
118130
119 if ne "${PJXJAR-}" ''131 if ne "${PJXJAR-}" ''
120 then132 then
121 x ln -s $PJXJAR $PREFIX/lib/m2vmp2cut-$VERSION/bin/ProjectX.jar133 x ln -s $PJXJAR "$D_LIBEXECDIR"/bin/ProjectX.jar
122 fi134 fi
123 echo; echo Installation done.; echo135 echo; echo Installation done.; echo
124}136}

@@ -236,6 +248,7 @@
236#,# src/bufwrite.h248#,# src/bufwrite.h
237#,# src/fileparts.c249#,# src/fileparts.c
238#,# src/filerotate.c250#,# src/filerotate.c
251#,# src/libpreload_ffm2vtoyuv4mpeghax.c
239#,# src/m2vcut-gui.c252#,# src/m2vcut-gui.c
240#,# src/m2vfilter.c253#,# src/m2vfilter.c
241#,# src/m2vscan.c254#,# src/m2vscan.c

@@ -243,8 +256,6 @@
243#,# src/Makefile256#,# src/Makefile
244#,# src/mp2cutpoints.c257#,# src/mp2cutpoints.c
245#,# src/textdisp.c258#,# src/textdisp.c
246#,# src/warpxpointer.c
247#,# src/wavgraph.c
248#,# src/x.c259#,# src/x.c
249#,# src/x.h260#,# src/x.h
250#,# src/zzob.c261#,# src/zzob.c
m2vmp2cut-0.84/NEWSm2vmp2cut-0.86/NEWS
@@ -1,3 +1,10 @@
1m2vmp2cut 0.86 (2012-10-18)
2===========================
3
4* Improved build system with user-definable optimization flags
5 and some installation variable by importing and fitting patches
6 from Göran Uddeborg.
7
1m2vmp2cut 0.84 (2012-10-14)8m2vmp2cut 0.84 (2012-10-14)
2===========================9===========================
310
m2vmp2cut-0.84/READMEm2vmp2cut-0.86/README
@@ -1,5 +1,5 @@
11
2m2vmp2cut 0.842m2vmp2cut 0.86
33
4m2vmp2cut is command-line driven frame accurate (currently PAL) mpeg24m2vmp2cut is command-line driven frame accurate (currently PAL) mpeg2
5video (m2v file) with accompanied mp2 audio (mp2 file) cutter.5video (m2v file) with accompanied mp2 audio (mp2 file) cutter.

»+++»: m2vmp2cut-0.86/src/libpreload_ffm2vtoyuv4mpeghax.c

m2vmp2cut-0.84/src/m2vtoyuv.cm2vmp2cut-0.86/src/m2vtoyuv.c
@@ -5,9 +5,9 @@
5 WARN=$WARN' -W -Wwrite-strings -Wcast-qual -Wshadow' # -Wconversion5 WARN=$WARN' -W -Wwrite-strings -Wcast-qual -Wshadow' # -Wconversion
6 eval `cat config/mpeg2.conf`6 eval `cat config/mpeg2.conf`
7 XF="$mpeg2_only -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64"7 XF="$mpeg2_only -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64"
8 set -x8 case ${1-} in '') set x -O2; shift; esac
9 #${CC:-gcc} -ggdb $WARN "$@" -o "$TRG" "$0" $XF9 #case ${1-} in '') set x -ggdb; shift; esac
10 exec ${CC:-gcc} --std=c99 -O2 $WARN "$@" -o "$TRG" "$0" $XF10 set -x; exec ${CC:-gcc} --std=c99 $WARN "$@" -o "$TRG" "$0" $XF
11 exit 011 exit 0
12 */12 */
13#endif13#endif

@@ -20,7 +20,7 @@
20 * All rights reserved20 * All rights reserved
21 *21 *
22 * Created: Fri Feb 08 17:16:45 EET 2008 too22 * Created: Fri Feb 08 17:16:45 EET 2008 too
23 * Last modified: Thu 27 Sep 2012 23:32:11 EEST too23 * Last modified: Mon 15 Oct 2012 16:25:01 EEST too
24 */24 */
2525
26/* this program is originally based on:26/* this program is originally based on:
m2vmp2cut-0.84/src/Makefilem2vmp2cut-0.86/src/Makefile
@@ -65,7 +65,9 @@
6565
66#CFLAGS= -ggdb $(LF_OPTS) $(WOPTS) $(INCLS)66#CFLAGS= -ggdb $(LF_OPTS) $(WOPTS) $(INCLS)
67#CFLAGS= -s -O3 $(LF_OPTS) $(WOPTS) $(INCLS)67#CFLAGS= -s -O3 $(LF_OPTS) $(WOPTS) $(INCLS)
68CFLAGS= -std=c99 -s -O3 $(LF_OPTS) $(WOPTS) $(INCLS)68CFLAGS= -std=c99 $(OPTFLAGS) $(LF_OPTS) $(WOPTS) $(INCLS)
69
70OPTFLAGS=-s -O3
6971
70../bin/m2vmp2cut.bin: $(OBJS)72../bin/m2vmp2cut.bin: $(OBJS)
71 $(CC) -o $@ $(OBJS)73 $(CC) -o $@ $(OBJS)

@@ -86,23 +88,26 @@
86 $(CC) -o $@ obj_b/filerotate.o obj_b/x.o88 $(CC) -o $@ obj_b/filerotate.o obj_b/x.o
8789
88../bin/m2vcut-gui: m2vcut-gui.c config/mpeg2.conf90../bin/m2vcut-gui: m2vcut-gui.c config/mpeg2.conf
91 sh m2vcut-gui.c $(OPTFLAGS)
89 sh m2vcut-gui.c && mv m2vcut-gui ../bin92 mv m2vcut-gui ../bin
90# $(CC) $(CFLAGS) -c $< -o $@93# $(CC) $(CFLAGS) -c $< -o $@
9194
92#../bin/wavgraph: wavgraph.c obj_b/x.o95#../bin/wavgraph: wavgraph.c obj_b/x.o
93# sh wavgraph.c && mv wavgraph ../bin96# sh wavgraph.c && mv wavgraph ../bin
9497
95../bin/m2vtoyuv: m2vtoyuv.c config/mpeg2.conf98../bin/m2vtoyuv: m2vtoyuv.c config/mpeg2.conf
99 sh m2vtoyuv.c $(OPTFLAGS)
96 sh m2vtoyuv.c && mv m2vtoyuv ../bin100 mv m2vtoyuv ../bin
97101
98#../bin/warpxpointer: warpxpointer.c102#../bin/warpxpointer: warpxpointer.c
99# sh warpxpointer.c && mv warpxpointer ../bin103# sh warpxpointer.c && mv warpxpointer ../bin
100104
101../bin/textdisp: textdisp.c105../bin/textdisp: textdisp.c
106 sh textdisp.c $(OPTFLAGS)
102 sh textdisp.c && mv textdisp ../bin107 mv textdisp ../bin
103108
104../bin/libpreload_ffm2vtoyuv4mpeghax.so: libpreload_ffm2vtoyuv4mpeghax.c109../bin/libpreload_ffm2vtoyuv4mpeghax.so: libpreload_ffm2vtoyuv4mpeghax.c
105 sh $<110 sh $< $(OPTFLAGS)
106 chmod 644 libpreload_ffm2vtoyuv4mpeghax.so111 chmod 644 libpreload_ffm2vtoyuv4mpeghax.so
107 mv libpreload_ffm2vtoyuv4mpeghax.so ../bin112 mv libpreload_ffm2vtoyuv4mpeghax.so ../bin
108113

«---«: m2vmp2cut-0.84/src/warpxpointer.c

«---«: m2vmp2cut-0.84/src/wavgraph.c

uni2htmldiff.py