summaryrefslogtreecommitdiff
blob: 5e7dc767cdfb435a7e4ac038483e099e09aabeb0 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
? gmon.out
? mpeg2enc/xx.c
Index: Makefile.am
===================================================================
RCS file: /cvsroot/avidemux2/avidemux2/avidemux2/avidemux/Makefile.am,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 Makefile.am
--- Makefile.am	16 Sep 2003 17:57:34 -0000	1.1.1.1
+++ Makefile.am	28 Sep 2003 15:26:25 -0000
@@ -19,12 +19,12 @@
   ../adm_lavcodec/libavcodec.a \
 ./ADM_mpPostProc/libADM_mpPostProc.a  ./ADM_editor/libADM_editor.a \
 ./ADM_library/libADM_library.a ./ADM_audiocodec/libADM_audiocodec.a ./ADM_audio/libADM_audio.a \
-./mpeg2enc/libmpeg2enc.a \
 ./oplug_avi/liboplug_avi.a  ./oplug_mpegFF/liboplug_mpegFF.a  \
 ./ADM_filter/libADM_filter.a \
 ./ADM_video/libADM_video.a   ./ADM_encoder/libADM_encoder.a  \
 ./ADM_codecs/libADM_codecs.a ./ADM_vp32/libADM_vp32.a   ./ADM_audiofilter/libADM_audiofilter.a \
 ./oplug_mpeg/liboplug_mpeg.a ./ADM_gui2/libADM_gui2.a  \
+./mpeg2enc/libmpeg2enc.a \
 ./ADM_gui/libADM_gui.a ./ADM_inpics/libADM_inpics.a  ./ADM_3gp/libADM_3gp.a ./ADM_h263/libADM_h263.a   \
 ./ADM_nuv/libADM_nuv.a  ./ADM_ogm/libADM_ogm.a ./ADM_audiodevice/libADM_audiodevice.a \
 ./ADM_mpeg2dec/libADM_mpeg2dec.a ./ADM_mpegindexer/libADM_mpegindexer.a   \
Index: gtk_gui.cpp
===================================================================
RCS file: /cvsroot/avidemux2/avidemux2/avidemux2/avidemux/gtk_gui.cpp,v
retrieving revision 1.5
diff -u -r1.5 gtk_gui.cpp
--- gtk_gui.cpp	23 Sep 2003 17:02:01 -0000	1.5
+++ gtk_gui.cpp	28 Sep 2003 15:26:32 -0000
@@ -14,7 +14,7 @@
  *   (at your option) any later version.                                   *
  *                                                                         *
  ***************************************************************************/
-#define TEST_MP2
+//#define TEST_MP2
 
 
 #include <stdio.h>