]> git.pld-linux.org Git - packages/mpeg4ip.git/blame - mpeg4ip-system-mp4v2.patch
projects / packages / mpeg4ip.git / blame
? search:
summary | shortlog | log | commit | commitdiff | tree
blob | blame (incremental) | history | HEAD
- adjusted system-mpeg4ip patch not to rely on mp4v2 dir in CFLAGS
[packages/mpeg4ip.git] / mpeg4ip-system-mp4v2.patch
CommitLineData
20654187
JR		 1diff -ur mpeg4ip-1.6.1/configure.in mpeg4ip-1.6.1-system-mp4v2/configure.in
2--- mpeg4ip-1.6.1/configure.in 2012-11-13 13:55:08.198816022 +0100
3+++ mpeg4ip-1.6.1-system-mp4v2/configure.in 2012-11-13 13:30:42.865534377 +0100
4@@ -910,7 +910,6 @@
5 doc/ietf/Makefile \
6 doc/mcast/Makefile \
7 doc/programs/Makefile \
8- doc/mp4v2/Makefile \
9 include/Makefile \
10 lib/Makefile \
11 lib/audio/Makefile \
12@@ -922,9 +921,6 @@
13 lib/ismacryp/Makefile \
14 lib/srtp/Makefile \
15 lib/mp4/doc/Makefile \
16- lib/mp4v2/Makefile \
17- lib/mp4v2/test/Makefile \
18- lib/mp4v2/util/Makefile \
19 lib/mp4av/Makefile \
20 lib/mpeg2ps/Makefile \
21 lib/mpeg2t/Makefile \
22diff -ur mpeg4ip-1.6.1/doc/Makefile.am mpeg4ip-1.6.1-system-mp4v2/doc/Makefile.am
23--- mpeg4ip-1.6.1/doc/Makefile.am 2004-05-18 00:06:05.000000000 +0200
24+++ mpeg4ip-1.6.1-system-mp4v2/doc/Makefile.am 2012-11-13 13:54:48.655483376 +0100
25@@ -1,4 +1,4 @@
26-SUBDIRS = ietf mcast programs mp4v2
27+SUBDIRS = ietf mcast programs
28
29 EXTRA_DIST = \
30 Building_mpeg4ip_with_V4L2_support.html \
31diff -ur mpeg4ip-1.6.1/lib/Makefile.am mpeg4ip-1.6.1-system-mp4v2/lib/Makefile.am
32--- mpeg4ip-1.6.1/lib/Makefile.am 2006-09-29 21:55:39.000000000 +0200
33+++ mpeg4ip-1.6.1-system-mp4v2/lib/Makefile.am 2012-11-13 13:30:42.865534377 +0100
34@@ -8,4 +8,4 @@
35 endif
36 endif
37
38-SUBDIRS = utils audio avi ffmpeg fposrec gnu ismacryp mp4av mp4 mp4v2 msg_queue rtp sdp mpeg2t mpeg2ps srtp $(extradir)
39+SUBDIRS = utils audio avi ffmpeg fposrec gnu ismacryp mp4av mp4 msg_queue rtp sdp mpeg2t mpeg2ps srtp $(extradir)
40diff -ur mpeg4ip-1.6.1/lib/mp4av/Makefile.am mpeg4ip-1.6.1-system-mp4v2/lib/mp4av/Makefile.am
41--- mpeg4ip-1.6.1/lib/mp4av/Makefile.am 2012-11-13 13:55:08.185482687 +0100
42+++ mpeg4ip-1.6.1-system-mp4v2/lib/mp4av/Makefile.am 2012-11-13 13:34:10.372193724 +0100
ee000417
JB		 43@@ -1,7 +1,7 @@
44
45 INCLUDES = \
46 -I$(top_srcdir)/include \
47- -I$(top_srcdir)/lib/mp4v2 \
48+ -I/usr/include/mp4v2 \
49 -I$(top_srcdir)/lib/avi
50
51 AM_CXXFLAGS = -DMPEG4IP @BILLS_CPPWARNINGS@
20654187
JR		 52@@ -48,10 +48,7 @@
53 rfcisma.cpp \
54 rfch264.cpp
55
56-libmp4av_la_LIBADD = $(top_builddir)/lib/mp4v2/libmp4v2.la
57-
58-$(top_builddir)/lib/mp4v2/libmp4v2.la:
59- $(MAKE) -C $(top_builddir)/lib/mp4v2 libmp4v2.la
60+libmp4av_la_LIBADD = -lmp4v2
61
62 EXTRA_DIST = libmp4av.dsp mp4av.vcproj
63
64diff -ur mpeg4ip-1.6.1/lib/mpeg2ps/Makefile.am mpeg4ip-1.6.1-system-mp4v2/lib/mpeg2ps/Makefile.am
65--- mpeg4ip-1.6.1/lib/mpeg2ps/Makefile.am 2012-11-13 13:55:08.188816020 +0100
66+++ mpeg4ip-1.6.1-system-mp4v2/lib/mpeg2ps/Makefile.am 2012-11-13 13:34:50.808858966 +0100
ee000417
JB		 67@@ -6,16 +6,16 @@
68 mpeg2ps_util.c
69
70
71-INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/lib -I$(top_srcdir)/lib/mp4av -I$(top_srcdir)/lib/mp4v2
72+INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/lib -I$(top_srcdir)/lib/mp4av -I/usr/include/mp4v2
73 AM_CFLAGS = -D_REENTRANT @BILLS_CWARNINGS@
74 AM_CXXFLAGS = -D_REENTRANT @BILLS_CPPWARNINGS@
75
76 bin_PROGRAMS = mpeg_ps_info mpeg_ps_extract
77 prog_libadd = \
20654187
JR		 78 libmpeg2_program.la \
79 $(top_builddir)/lib/gnu/libmpeg4ip_gnu.la \
80 $(top_builddir)/lib/mp4av/libmp4av.la \
81- $(top_builddir)/lib/mp4v2/libmp4v2.la
82+ -lmp4v2
83
84 mpeg_ps_info_SOURCES = ps_info.cpp
85 mpeg_ps_info_LDADD = $(prog_libadd)
86@@ -27,7 +27,7 @@
87 mpeg2ps_test_LDADD = libmpeg2_program.la \
88 $(top_builddir)/lib/gnu/libmpeg4ip_gnu.la \
89 $(top_builddir)/lib/mp4av/libmp4av.la \
90- $(top_builddir)/lib/mp4v2/libmp4v2.la
91+ -lmp4v2
92
93 EXTRA_DIST=libmpeg2ps.dsp libmpeg2ps.vcproj mpeg_ps_info.vcproj
94
95diff -ur mpeg4ip-1.6.1/lib/mpeg2t/Makefile.am mpeg4ip-1.6.1-system-mp4v2/lib/mpeg2t/Makefile.am
96--- mpeg4ip-1.6.1/lib/mpeg2t/Makefile.am 2007-01-30 22:53:42.000000000 +0100
97+++ mpeg4ip-1.6.1-system-mp4v2/lib/mpeg2t/Makefile.am 2012-11-13 13:35:25.452191078 +0100
ee000417
JB		 98@@ -9,7 +9,7 @@
99 mpeg2t_video.c \
100 mpeg2t_util.c
101
102-INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/lib -I$(top_srcdir)/lib/mp4av -I$(top_srcdir)/lib/mp4v2
103+INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/lib -I$(top_srcdir)/lib/mp4av -I/usr/include/mp4v2
104 AM_CFLAGS = -D_REENTRANT @BILLS_CWARNINGS@
105 AM_CXXFLAGS = -D_REENTRANT @BILLS_CPPWARNINGS@
106
20654187
JR		 107@@ -21,21 +21,21 @@
108 mpeg2t_dump_LDADD = libmpeg2_transport.la \
109 $(top_builddir)/lib/gnu/libmpeg4ip_gnu.la \
110 $(top_builddir)/lib/mp4av/libmp4av.la \
111- $(top_builddir)/lib/mp4v2/libmp4v2.la \
112+ -lmp4v2 \
113 @SDL_LIBS@
114
115 mpeg2t_test_SOURCES = test.cpp
116 mpeg2t_test_LDADD = libmpeg2_transport.la \
117 $(top_builddir)/lib/gnu/libmpeg4ip_gnu.la \
118 $(top_builddir)/lib/mp4av/libmp4av.la \
119- $(top_builddir)/lib/mp4v2/libmp4v2.la \
120+ -lmp4v2 \
121 @SDL_LIBS@
122
123 mpeg2t_extract_SOURCES = mpeg2t_extract.cpp
124 mpeg2t_extract_LDADD = libmpeg2_transport.la \
125 $(top_builddir)/lib/gnu/libmpeg4ip_gnu.la \
126 $(top_builddir)/lib/mp4av/libmp4av.la \
127- $(top_builddir)/lib/mp4v2/libmp4v2.la \
128+ -lmp4v2 \
129 @SDL_LIBS@
130
131 EXTRA_DIST=
132diff -ur mpeg4ip-1.6.1/lib/srtp/Makefile.am mpeg4ip-1.6.1-system-mp4v2/lib/srtp/Makefile.am
133--- mpeg4ip-1.6.1/lib/srtp/Makefile.am 2012-11-13 13:55:08.188816020 +0100
134+++ mpeg4ip-1.6.1-system-mp4v2/lib/srtp/Makefile.am 2012-11-13 13:35:59.645523204 +0100
ee000417
JB		 135@@ -3,7 +3,7 @@
136 INCLUDES=-I$(top_srcdir)/include \
137 -I$(top_srcdir)/lib/rtp \
138 -I$(top_srcdir)/lib/utils \
139- -I$(top_srcdir)/lib/mp4v2
140+ -I/usr/include/mp4v2
141
142 AM_CFLAGS = -D_REENTRANT @BILLS_CWARNINGS@
143
20654187
JR		 144@@ -11,7 +11,7 @@
145 liblibsrtp.h
146 libsrtpif_la_LIBADD = @SRTPLIB@ \
147 @SDL_LIBS@ \
148- $(top_builddir)/lib/mp4v2/libmp4v2.la \
149+ -lmp4v2 \
150 $(top_builddir)/lib/utils/libmutex.la \
151 $(top_builddir)/lib/utils/libutils.la \
152 $(top_builddir)/lib/rtp/libuclmmbase.la
153@@ -21,9 +21,9 @@
154 check_PROGRAMS = test_srtp_client test_srtp_server
155
156 test_srtp_client_SOURCES = test_srtp_client.cpp
157-test_srtp_client_LDADD = ../rtp/libuclmmbase.la libsrtpif.la ../mp4v2/libmp4v2.la
158+test_srtp_client_LDADD = ../rtp/libuclmmbase.la libsrtpif.la -lmp4v2
159
160 test_srtp_server_SOURCES = test_srtp_server.cpp
161-test_srtp_server_LDADD = ../rtp/libuclmmbase.la libsrtpif.la ../mp4v2/libmp4v2.la
162+test_srtp_server_LDADD = ../rtp/libuclmmbase.la libsrtpif.la -lmp4v2
163
164 EXTRA_DIST=liblibstrp.vcproj
165diff -ur mpeg4ip-1.6.1/player/lib/mp4util/Makefile.am mpeg4ip-1.6.1-system-mp4v2/player/lib/mp4util/Makefile.am
166--- mpeg4ip-1.6.1/player/lib/mp4util/Makefile.am 2007-09-18 22:52:07.000000000 +0200
167+++ mpeg4ip-1.6.1-system-mp4v2/player/lib/mp4util/Makefile.am 2012-11-13 13:36:24.408855664 +0100
168@@ -13,9 +13,9 @@
169 h264_sdp.c
170
171 libh264util_la_LIBADD = \
172- $(top_builddir)/lib/mp4v2/libmp4v2.la
173+ -lmp4v2
174
ee000417
JB		 175-INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/lib -I$(top_srcdir)/lib/mp4v2
176+INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/lib -I/usr/include/mp4v2
20654187
JR		 177
178 AM_CFLAGS = -D_REENTRANT @BILLS_CWARNINGS@
179
180diff -ur mpeg4ip-1.6.1/player/plugin/audio/g711/Makefile.am mpeg4ip-1.6.1-system-mp4v2/player/plugin/audio/g711/Makefile.am
181--- mpeg4ip-1.6.1/player/plugin/audio/g711/Makefile.am 2005-08-22 22:18:26.000000000 +0200
182+++ mpeg4ip-1.6.1-system-mp4v2/player/plugin/audio/g711/Makefile.am 2012-11-13 13:38:34.775517730 +0100
183@@ -6,10 +6,10 @@
184 ourg711.h ourg711.cpp
185 g711_audio_plugin_la_LIBADD = \
186 $(top_builddir)/lib/mp4av/libmp4av.la \
187- $(top_builddir)/lib/mp4v2/libmp4v2.la \
188+ -lmp4v2 \
189 -lm
190
ee000417
JB		 191-INCLUDES = -I$(top_srcdir)/player/src -I$(top_srcdir)/include -I$(top_srcdir)/lib -I$(top_srcdir)/lib/mp4av -I$(top_srcdir)/lib/mp4v2 -I$(top_srcdir)/lib/sdp
192+INCLUDES = -I$(top_srcdir)/player/src -I$(top_srcdir)/include -I$(top_srcdir)/lib -I$(top_srcdir)/lib/mp4av -I/usr/include/mp4v2 -I$(top_srcdir)/lib/sdp
20654187
JR		 193
194 AM_CFLAGS = -D_REENTRANT -fexceptions @BILLS_CWARNINGS@
195
196diff -ur mpeg4ip-1.6.1/player/plugin/video/ffmpeg/Makefile.am mpeg4ip-1.6.1-system-mp4v2/player/plugin/video/ffmpeg/Makefile.am
197--- mpeg4ip-1.6.1/player/plugin/video/ffmpeg/Makefile.am 2007-01-22 18:31:17.000000000 +0100
198+++ mpeg4ip-1.6.1-system-mp4v2/player/plugin/video/ffmpeg/Makefile.am 2012-11-13 13:39:35.615515585 +0100
199@@ -12,14 +12,12 @@
200 ffmpeg.cpp ffmpeg.h
201 ffmpeg_video_plugin_la_LIBADD = \
202 -lm \
203- $(top_builddir)/lib/mp4v2/libmp4v2.la \
204+ -lmp4v2 \
205 $(top_builddir)/player/lib/mp4util/libmp4util.la \
206 $(top_builddir)/lib/utils/libmutex.la \
207 $(top_builddir)/lib/mp4av/libmp4av.la \
208- $(top_builddir)/lib/mp4v2/libmp4v2.la \
209 $(top_builddir)/player/lib/mp4util/libh264util.la \
210 $(top_builddir)/lib/ffmpeg/libmpeg4ip_ffmpeg.la \
211- $(top_builddir)/lib/mp4v2/libmp4v2.la \
212 @FFMPEG_LIB@
213
214 INCLUDES = \
ee000417
JB		 215@@ -27,7 +27,7 @@
216 -I$(top_srcdir)/lib \
217 -I$(top_srcdir)/lib/ffmpeg \
218 -I$(top_srcdir)/lib/mp4av \
219- -I$(top_srcdir)/lib/mp4v2 \
220+ -I/usr/include/mp4v2 \
221 -I$(top_srcdir)/lib/sdp \
222 @FFMPEG_INC@
223
20654187
JR		 224diff -ur mpeg4ip-1.6.1/player/src/codec/aa/Makefile.am mpeg4ip-1.6.1-system-mp4v2/player/src/codec/aa/Makefile.am
225--- mpeg4ip-1.6.1/player/src/codec/aa/Makefile.am 2007-09-18 22:52:17.000000000 +0200
226+++ mpeg4ip-1.6.1-system-mp4v2/player/src/codec/aa/Makefile.am 2012-11-13 13:36:49.705521439 +0100
227@@ -11,12 +11,12 @@
228 aac_plugin_la_LIBADD = \
229 $(top_builddir)/player/lib/audio/faad/libmpeg4ip_faad.la \
230 $(top_builddir)/lib/mp4av/libmp4av.la \
231- $(top_builddir)/lib/mp4v2/libmp4v2.la \
232+ -lmp4v2 \
233 $(top_builddir)/player/lib/mp4util/libmp4util.la \
234 -lm
235
236
ee000417
JB		 237-INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/lib -I$(top_srcdir)/lib/sdp -I$(top_srcdir)/player/src -I$(top_srcdir)/player/lib/audio -I$(top_srcdir)/player/lib -I$(top_srcdir)/lib/mp4v2 -I$(top_srcdir)/lib/mp4av
238+INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/lib -I$(top_srcdir)/lib/sdp -I$(top_srcdir)/player/src -I$(top_srcdir)/player/lib/audio -I$(top_srcdir)/player/lib -I/usr/include/mp4v2 -I$(top_srcdir)/lib/mp4av
20654187
JR		 239
240 AM_CFLAGS = -D_REENTRANT -fexceptions @BILLS_CWARNINGS@
241
242diff -ur mpeg4ip-1.6.1/player/src/Makefile.am mpeg4ip-1.6.1-system-mp4v2/player/src/Makefile.am
243--- mpeg4ip-1.6.1/player/src/Makefile.am 2012-11-13 13:55:08.188816020 +0100
244+++ mpeg4ip-1.6.1-system-mp4v2/player/src/Makefile.am 2012-11-13 13:37:43.155519553 +0100
ee000417
JB		 245@@ -158,7 +158,7 @@
246 -I$(top_srcdir)/lib/ismacryp \
247 -I$(top_srcdir)/lib/mp4av \
248 -I$(top_srcdir)/lib/mp4 \
249- -I$(top_srcdir)/lib/mp4v2 \
250+ -I/usr/include/mp4v2 \
251 -I$(top_srcdir)/lib/mpeg2ps \
252 -I$(top_srcdir)/lib/msg_queue \
253 -I$(top_srcdir)/lib/rtp \
20654187
JR		 254@@ -187,7 +187,7 @@
255 $(top_builddir)/lib/utils/libmutex.la \
256 $(top_builddir)/player/lib/rtsp/librtsp.la \
257 $(top_builddir)/lib/mp4/libmp4.la \
258- $(top_builddir)/lib/mp4v2/libmp4v2.la \
259+ -lmp4v2 \
260 $(top_builddir)/lib/fposrec/libmpeg4ip_fposrec.la \
261 $(top_builddir)/lib/avi/libavi.la \
262 $(top_builddir)/lib/ismacryp/libismacryp.la \
263diff -ur mpeg4ip-1.6.1/server/mp4creator/Makefile.am mpeg4ip-1.6.1-system-mp4v2/server/mp4creator/Makefile.am
264--- mpeg4ip-1.6.1/server/mp4creator/Makefile.am 2012-11-13 13:55:08.188816020 +0100
265+++ mpeg4ip-1.6.1-system-mp4v2/server/mp4creator/Makefile.am 2012-11-13 13:40:41.645513256 +0100
ee000417
JB		 266@@ -1,7 +1,7 @@
267
268 INCLUDES = \
269 -I$(top_srcdir)/include \
270- -I$(top_srcdir)/lib/mp4v2 \
271+ -I/usr/include/mp4v2 \
272 -I$(top_srcdir)/lib/mp4av \
273 -I$(top_srcdir)/lib/avi \
274 -I$(top_srcdir)/lib/ismacryp \
20654187
JR		 275@@ -26,7 +26,7 @@
276
277 mp4creator_LDADD = \
278 $(top_builddir)/lib/mpeg2ps/libmpeg2_program.la \
279- $(top_builddir)/lib/mp4v2/libmp4v2.la \
280+ -lmp4v2 \
281 $(top_builddir)/lib/mp4av/libmp4av.la \
282 $(top_builddir)/lib/avi/libavi.la \
283 $(top_builddir)/lib/gnu/libmpeg4ip_gnu.la \
284diff -ur mpeg4ip-1.6.1/server/mp4live/Makefile.am mpeg4ip-1.6.1-system-mp4v2/server/mp4live/Makefile.am
285--- mpeg4ip-1.6.1/server/mp4live/Makefile.am 2012-11-13 13:55:08.188816020 +0100
286+++ mpeg4ip-1.6.1-system-mp4v2/server/mp4live/Makefile.am 2012-11-13 13:40:59.682179287 +0100
ee000417
JB		 287@@ -138,7 +138,7 @@
288 @GLIB_CFLAGS@ @GTK_CFLAGS@ \
289 -I$(top_srcdir)/include \
290 -I$(top_srcdir)/lib/ffmpeg \
291- -I$(top_srcdir)/lib/mp4v2 \
292+ -I/usr/include/mp4v2 \
293 -I$(top_srcdir)/lib/mp4av \
294 -I$(top_srcdir)/lib/msg_queue \
295 -I$(top_srcdir)/lib/rtp \
20654187
JR		 296@@ -161,7 +161,7 @@
297 libmp4live.la \
298 $(top_builddir)/lib/mpeg2ps/libmpeg2_program.la \
299 $(top_builddir)/lib/msg_queue/libmsg_queue.la \
300- $(top_builddir)/lib/mp4v2/libmp4v2.la \
301+ -lmp4v2 \
302 $(top_builddir)/lib/mp4av/libmp4av.la \
303 $(top_builddir)/lib/rtp/libuclmmbase.la \
304 $(top_builddir)/lib/utils/libmutex.la \
ee000417
JB		 305--- mpeg4ip-1.6.1/server/mp4live/gui/Makefile.am.orig 2012-12-06 18:38:25.645314273 +0100
306+++ mpeg4ip-1.6.1/server/mp4live/gui/Makefile.am 2012-12-07 22:14:31.399909844 +0100
307@@ -23,7 +23,7 @@
308 INCLUDES=@GLIB_CFLAGS@ @GTK_CFLAGS@ \
309 -I$(top_srcdir)/server/mp4live \
310 -I$(top_srcdir)/include \
311- -I$(top_srcdir)/lib/mp4v2 \
312+ -I/usr/include/mp4v2 \
313 -I$(top_srcdir)/lib/mp4av \
314 -I$(top_srcdir)/lib/msg_queue \
315 -I$(top_srcdir)/lib/rtp \
20654187
JR		 316diff -ur mpeg4ip-1.6.1/util/h264/Makefile.am mpeg4ip-1.6.1-system-mp4v2/util/h264/Makefile.am
317--- mpeg4ip-1.6.1/util/h264/Makefile.am 2007-09-18 22:52:21.000000000 +0200
318+++ mpeg4ip-1.6.1-system-mp4v2/util/h264/Makefile.am 2012-11-13 13:41:45.815510993 +0100
4987648a
JB		 319@@ -7,7 +7,7 @@
320
321 strip_bytes_SOURCES = strip.cpp
322
323-INCLUDES = -I$(srcdir) -I$(top_srcdir)/common/video/mpeg4 -I$(top_srcdir)/lib/mp4v2 -I$(top_srcdir)/include -I$(top_srcdir)/lib -I$(top_srcdir)/lib/mp4av
324+INCLUDES = -I$(srcdir) -I$(top_srcdir)/common/video/mpeg4 -I/usr/include/mp4v2 -I$(top_srcdir)/include -I$(top_srcdir)/lib -I$(top_srcdir)/lib/mp4av
325
326 AM_CFLAGS= -D_REENTRANT @BILLS_CWARNINGS@
327
20654187
JR		 328@@ -17,6 +17,6 @@
329 -lm \
330 $(top_builddir)/lib/gnu/libmpeg4ip_gnu.la \
331 $(top_builddir)/lib/mp4av/libmp4av.la \
332- $(top_builddir)/lib/mp4v2/libmp4v2.la
333+ -lmp4v2
334
335 EXTRA_DIST= h264_parse.dsp h264_parse.vcproj
336diff -ur mpeg4ip-1.6.1/util/mpeg2/Makefile.am mpeg4ip-1.6.1-system-mp4v2/util/mpeg2/Makefile.am
337--- mpeg4ip-1.6.1/util/mpeg2/Makefile.am 2005-08-22 22:18:28.000000000 +0200
338+++ mpeg4ip-1.6.1-system-mp4v2/util/mpeg2/Makefile.am 2012-11-13 13:42:07.652176889 +0100
4987648a
JB		 339@@ -4,7 +4,7 @@
340 mpeg2video_parse_SOURCES = \
341 main.cpp
342
343-INCLUDES = -I$(srcdir) -I$(top_srcdir)/common/video/mpeg4 -I$(top_srcdir)/lib/mp4v2 -I$(top_srcdir)/include -I$(top_srcdir)/lib -I$(top_srcdir)/lib/mp4av
344+INCLUDES = -I$(srcdir) -I$(top_srcdir)/common/video/mpeg4 -I/usr/include/mp4v2 -I$(top_srcdir)/include -I$(top_srcdir)/lib -I$(top_srcdir)/lib/mp4av
345
346 AM_CFLAGS= -D_REENTRANT @BILLS_CWARNINGS@
347
20654187
JR		 348@@ -13,6 +13,6 @@
349 mpeg2video_parse_LDADD = \
350 $(top_builddir)/lib/gnu/libmpeg4ip_gnu.la \
351 $(top_builddir)/lib/mp4av/libmp4av.la \
352- $(top_builddir)/lib/mp4v2/libmp4v2.la
353+ -lmp4v2
354
355 EXTRA_DIST=
356diff -ur mpeg4ip-1.6.1/util/mpeg4vol/Makefile.am mpeg4ip-1.6.1-system-mp4v2/util/mpeg4vol/Makefile.am
357--- mpeg4ip-1.6.1/util/mpeg4vol/Makefile.am 2005-10-04 00:24:04.000000000 +0200
358+++ mpeg4ip-1.6.1-system-mp4v2/util/mpeg4vol/Makefile.am 2012-11-13 13:42:22.478843031 +0100
4987648a
JB		 359@@ -4,7 +4,7 @@
360 mpeg4vol_SOURCES = \
361 main.cpp audio.cpp
362
363-INCLUDES = -I$(srcdir) -I$(top_srcdir)/common/video/mpeg4 -I$(top_srcdir)/lib/mp4v2 -I$(top_srcdir)/include -I$(top_srcdir)/lib -I$(top_srcdir)/lib/mp4av
364+INCLUDES = -I$(srcdir) -I$(top_srcdir)/common/video/mpeg4 -I/usr/include/mp4v2 -I$(top_srcdir)/include -I$(top_srcdir)/lib -I$(top_srcdir)/lib/mp4av
365
366 AM_CFLAGS= -D_REENTRANT @BILLS_CWARNINGS@
367
20654187
JR		 368@@ -12,6 +12,6 @@
369
370 mpeg4vol_LDADD = \
371 $(top_builddir)/lib/gnu/libmpeg4ip_gnu.la \
372- $(top_builddir)/lib/mp4v2/libmp4v2.la
373+ -lmp4v2
374
375 EXTRA_DIST=mpeg4vol.dsp
ee000417
JB		 376--- mpeg4ip-1.6.1/player/src/mp4_file.cpp.orig 2006-12-01 00:19:30.000000000 +0100
377+++ mpeg4ip-1.6.1/player/src/mp4_file.cpp 2012-12-06 18:08:29.688685040 +0100
378@@ -27,7 +27,7 @@
379 #include "player_media.h"
380 #include "player_util.h"
381 #include "media_utils.h"
382-#include <mp4.h>
626301c0 383+#include <mp4v2/mp4v2.h>
ee000417
JB		 384 #include "mp4_bytestream.h"
385 #include "mp4_file.h"
386 #include <mp4util/mpeg4_audio_config.h>
387@@ -55,7 +55,7 @@
388 MP4FileHandle fh;
389 CMp4File *Mp4File1;
390
391- fh = MP4Read(name, MP4_DETAILS_ERROR); // | MP4_DETAILS_READ | MP4_DETAILS_SAMPLE);
392+ fh = MP4Read(name);
393 if (!MP4_IS_VALID_FILE_HANDLE(fh)) {
394 psptr->set_message("`%s\' is not an mp4 file", name);
395 return -1;
396@@ -170,8 +170,8 @@
397 * in this context original format is encv
398 * and compressor specifies which codec
399 */
400- uint32_t verb = MP4GetVerbosity(m_mp4file);
401- MP4SetVerbosity(m_mp4file, verb & ~(MP4_DETAILS_ERROR));
402+ MP4LogLevel verb = MP4LogGetLevel();
403+ MP4LogSetLevel(MP4_LOG_NONE);
404 if (strcasecmp(vq[ix].original_fmt, "avc1") == 0) {
405 vbyte = new CMp4H264VideoByteStream(this, vq[ix].track_id);
406 } else if (strcasecmp(vq[ix].original_fmt, "encv") == 0) {
407@@ -205,7 +205,7 @@
408 } else {
409 vbyte = new CMp4VideoByteStream(this, vq[ix].track_id);
410 }
411- MP4SetVerbosity(m_mp4file, verb);
412+ MP4LogSetLevel(verb);
413
414 if (vbyte == NULL) {
415 delete mptr;
416@@ -216,9 +216,9 @@
417 if (ret != 0) {
418 return (-1);
419 }
420- MP4SetVerbosity(m_mp4file, verb & ~(MP4_DETAILS_ERROR));
421+ MP4LogSetLevel(MP4_LOG_NONE);
422 char *mp4info = MP4Info(m_mp4file, vq[ix].track_id);
423- MP4SetVerbosity(m_mp4file, verb);
424+ MP4LogSetLevel(verb);
425 char *temp = mp4info;
426 while (*temp != '\0') {
427 if (isspace(*temp)) *temp = ' ';
428@@ -253,8 +253,8 @@
429 }
430
431 /* check if ismacryp */
432- uint32_t verb = MP4GetVerbosity(m_mp4file);
433- MP4SetVerbosity(m_mp4file, verb & ~(MP4_DETAILS_ERROR));
434+ MP4LogLevel verb = MP4LogGetLevel();
435+ MP4LogSetLevel(MP4_LOG_NONE);
436 if (MP4IsIsmaCrypMediaTrack(m_mp4file, aq[ix].track_id)) {
437 MP4GetTrackIntegerProperty(m_mp4file,
438 aq[ix].track_id, "mdia.minf.stbl.stsd.enca.sinf.schi.iSFM.IV-length", &IVLength);
439@@ -262,7 +262,7 @@
440 } else {
441 abyte = new CMp4AudioByteStream(this, aq[ix].track_id);
442 }
443- MP4SetVerbosity(m_mp4file, verb);
444+ MP4LogSetLevel(verb);
445
446 audio_info_t *ainfo;
447 ainfo = (audio_info_t *)malloc(sizeof(audio_info_t));
448@@ -310,9 +310,9 @@
449 if (ret != 0) {
450 return (-1);
451 }
452- MP4SetVerbosity(m_mp4file, verb & ~(MP4_DETAILS_ERROR));
453+ MP4LogSetLevel(MP4_LOG_NONE);
454 char *mp4info = MP4Info(m_mp4file, aq[ix].track_id);
455- MP4SetVerbosity(m_mp4file, verb);
456+ MP4LogSetLevel(verb);
457 char *temp = mp4info;
458 while (*temp != '\0') {
459 if (isspace(*temp)) *temp = ' ';
460@@ -339,7 +339,7 @@
461 //uint64_t IVLength;
462 CPlayerMedia *mptr;
463 codec_plugin_t *plugin;
464- uint32_t verb = MP4GetVerbosity(m_mp4file);
465+ MP4LogLevel verb = MP4LogGetLevel();
466 for (ix = 0; ix < text_offset; ix++) {
467 if (tq[ix].enabled != 0) {
468 CMp4TextByteStream *tbyte;
469@@ -350,8 +350,8 @@
470
471 /* check if ismacryp */
472 #if 0
473- uint32_t verb = MP4GetVerbosity(m_mp4file);
474- MP4SetVerbosity(m_mp4file, verb & ~(MP4_DETAILS_ERROR));
475+ MP4LogLevel verb = MP4LogGetLevel();
476+ MP4LogSetLevel(MP4_LOGL_NONE);
477 if (MP4IsIsmaCrypMediaTrack(m_mp4file, aq[ix].track_id)) {
478 IVLength = MP4GetTrackIntegerProperty(m_mp4file,
479 aq[ix].track_id, "mdia.minf.stbl.stsd.enca.sinf.schi.iSFM.IV-length");
480@@ -359,7 +359,7 @@
481 } else {
482 abyte = new CMp4AudioByteStream(this, aq[ix].track_id);
483 }
484- MP4SetVerbosity(m_mp4file, verb);
485+ MP4LogSetLevel(verb);
486 #else
487 tbyte = new CMp4TextByteStream(this, tq[ix].track_id,
488 MP4GetHrefTrackBaseUrl(m_mp4file,
489@@ -394,9 +394,9 @@
490 if (ret != 0) {
491 return (-1);
492 }
493- MP4SetVerbosity(m_mp4file, verb & ~(MP4_DETAILS_ERROR));
494+ MP4LogSetLevel(MP4_LOG_NONE);
495 char *mp4info = MP4Info(m_mp4file, tq[ix].track_id);
496- MP4SetVerbosity(m_mp4file, verb);
497+ MP4LogSetLevel(verb);
498 char *temp = mp4info;
499 while (*temp != '\0') {
500 if (isspace(*temp)) *temp = ' ';
501@@ -433,13 +433,13 @@
502 u_int32_t bufsize;
503 char original_fmt[8];
504
505- uint32_t verb = MP4GetVerbosity(m_mp4file);
506- MP4SetVerbosity(m_mp4file, verb & ~(MP4_DETAILS_ERROR));
507+ MP4LogLevel verb = MP4LogGetLevel();
508+ MP4LogSetLevel(MP4_LOG_NONE);
509 video_count = MP4GetNumberOfTracks(m_mp4file, MP4_VIDEO_TRACK_TYPE);
510 audio_count = MP4GetNumberOfTracks(m_mp4file, MP4_AUDIO_TRACK_TYPE);
511 text_count = MP4GetNumberOfTracks(m_mp4file, MP4_CNTL_TRACK_TYPE);
512 mp4f_message(LOG_DEBUG, "cntl tracks %u", text_count);
513- MP4SetVerbosity(m_mp4file, verb);
514+ MP4LogSetLevel(verb);
515
516 if (video_count == 0 && audio_count == 0 && text_count == 0) {
517 psptr->set_message("No audio, video or control tracks in file");
518@@ -492,9 +492,9 @@
519 uint8_t profileID = MP4GetVideoProfileLevel(m_mp4file, trackId);
520 mp4f_message(LOG_DEBUG, "MP4 - got track %x profile ID %d",
521 trackId, profileID);
522- MP4SetVerbosity(m_mp4file, verb & ~(MP4_DETAILS_ERROR));
523+ MP4LogSetLevel(MP4_LOG_NONE);
524 MP4GetTrackESConfiguration(m_mp4file, trackId, &foo, &bufsize);
525- MP4SetVerbosity(m_mp4file, verb);
526+ MP4LogSetLevel(verb);
527 vq[video_offset].type = video_type;
528 vq[video_offset].profile = profileID;
529 vq[video_offset].fptr = NULL;
530@@ -609,13 +609,13 @@
531 uint8_t *userdata = NULL;
532 u_int32_t userdata_size;
533 aq[audio_offset].type = MP4GetTrackEsdsObjectTypeId(m_mp4file, trackId);
534- MP4SetVerbosity(m_mp4file, verb & ~(MP4_DETAILS_ERROR));
535+ MP4LogSetLevel(MP4_LOG_NONE);
536 aq[audio_offset].profile = MP4GetAudioProfileLevel(m_mp4file);
537 MP4GetTrackESConfiguration(m_mp4file,
538 trackId,
539 &userdata,
540 &userdata_size);
541- MP4SetVerbosity(m_mp4file, verb);
542+ MP4LogSetLevel(verb);
543 aq[audio_offset].config = userdata;
544 aq[audio_offset].config_len = userdata_size;
545 }
546@@ -631,9 +631,9 @@
547 aq[audio_offset].fptr = NULL;
548 aq[audio_offset].sampling_freq =
549 MP4GetTrackTimeScale(m_mp4file, trackId);
550- MP4SetVerbosity(m_mp4file, verb & ~(MP4_DETAILS_ERROR));
551+ MP4LogSetLevel(MP4_LOG_NONE);
552 aq[audio_offset].chans = MP4GetTrackAudioChannels(m_mp4file, trackId);
553- MP4SetVerbosity(m_mp4file, verb);
554+ MP4LogSetLevel(verb);
555 aq[audio_offset].enabled = 0;
556 aq[audio_offset].reference = NULL;
557 audio_offset++;
558@@ -711,14 +711,13 @@
559 if (audret < 0 || textret < 0) ret_value = -1;
560
561- char *name;
562- verb = MP4GetVerbosity(m_mp4file);
563- MP4SetVerbosity(m_mp4file, verb & ~(MP4_DETAILS_ERROR));
564- if (MP4GetMetadataName(m_mp4file, &name) &&
565- name != NULL) {
566- psptr->set_session_desc(0, name);
567- free(name);
568+ const MP4Tags *tags = MP4TagsAlloc();
569+ verb = MP4LogGetLevel();
570+ MP4LogSetLevel(MP4_LOG_NONE);
571+ if (MP4TagsFetch(tags, m_mp4file) && tags->name != NULL) {
572+ psptr->set_session_desc(0, tags->name);
573 }
574- MP4SetVerbosity(m_mp4file, verb);
575+ MP4TagsFree(tags);
576+ MP4LogSetLevel(verb);
577
578 return (ret_value);
579 }
580--- mpeg4ip-1.6.1/player/src/media_utils.h.orig 2006-10-24 00:26:42.000000000 +0200
581+++ mpeg4ip-1.6.1/player/src/media_utils.h 2012-12-07 16:41:45.473659334 +0100
4987648a 582@@ -23,7 +23,7 @@
ee000417
JB		 583
584 #include "player_session.h"
585 #include "our_bytestream.h"
586-#include "mp4.h"
626301c0 587+#include <mp4v2/mp4v2.h>
ee000417
JB		 588
589 typedef struct video_query_t {
590 uint32_t track_id;
591--- mpeg4ip-1.6.1/player/src/mp4_file.h.orig 2005-04-19 23:51:04.000000000 +0200
592+++ mpeg4ip-1.6.1/player/src/mp4_file.h 2012-12-07 16:49:28.250316353 +0100
593@@ -23,7 +23,7 @@
594 */
595 #ifndef __MP4_FILE_H__
596 #define __MP4_FILE_H__ 1
597-#include <mp4.h>
626301c0 598+#include <mp4v2/mp4v2.h>
ee000417
JB		 599 #include "mpeg4ip_sdl_includes.h"
600
601 class CPlayerSession;
602--- mpeg4ip-1.6.1/lib/mp4av/mp4av.h.orig 2004-11-20 00:23:52.000000000 +0100
603+++ mpeg4ip-1.6.1/lib/mp4av/mp4av.h 2012-12-07 16:52:57.096978668 +0100
604@@ -22,7 +22,8 @@
605 #ifndef __MP4AV_INCLUDED__
606 #define __MP4AV_INCLUDED__
607
608-#include <mp4.h>
609+#include "mpeg4ip.h"
626301c0 610+#include <mp4v2/mp4v2.h>
ee000417
JB		 611
612 #ifdef __cplusplus
613 /* exploit C++ ability of default values for function parameters */
614--- mpeg4ip-1.6.1/player/src/codec/aa/aac.cpp.orig 2006-08-07 20:27:23.000000000 +0200
615+++ mpeg4ip-1.6.1/player/src/codec/aa/aac.cpp 2012-12-07 16:56:01.946974815 +0100
616@@ -21,7 +21,7 @@
617 #include "aac.h"
618 #include <mp4util/mpeg4_audio_config.h>
619 #include <mp4util/mpeg4_sdp.h>
620-#include <mp4.h>
626301c0 621+#include <mp4v2/mp4v2.h>
ee000417
JB		 622 #include <mp4av.h>
623
624 #define DEBUG_SYNC 2
625--- mpeg4ip-1.6.1/player/src/codec/mp3/Makefile.am.orig 2012-12-06 18:38:25.648647606 +0100
626+++ mpeg4ip-1.6.1/player/src/codec/mp3/Makefile.am 2012-12-07 16:56:51.053640459 +0100
627@@ -34,7 +34,7 @@
628 $(top_builddir)/lib/fposrec/libmpeg4ip_fposrec.la
629
630
631-INCLUDES = -I$(top_srcdir)/player/src -I$(top_srcdir)/player/lib -I$(top_srcdir)/player/lib/audio -I$(top_srcdir)/common/video/mpeg4 -I$(top_srcdir)/include -I$(top_srcdir)/lib -I$(top_srcdir)/lib/mp4v2 -I$(top_srcdir)/lib/sdp -I$(top_srcdir)/lib/utils
632+INCLUDES = -I$(top_srcdir)/player/src -I$(top_srcdir)/player/lib -I$(top_srcdir)/player/lib/audio -I$(top_srcdir)/common/video/mpeg4 -I$(top_srcdir)/include -I$(top_srcdir)/lib -I/usr/include/mp4v2 -I$(top_srcdir)/lib/sdp -I$(top_srcdir)/lib/utils
633
634 AM_CFLAGS = -D_REENTRANT -fexceptions @BILLS_CWARNINGS@
635
636--- mpeg4ip-1.6.1/player/src/codec/mp3/mp3if.cpp.orig 2006-08-07 20:27:23.000000000 +0200
637+++ mpeg4ip-1.6.1/player/src/codec/mp3/mp3if.cpp 2012-12-07 17:00:38.903635708 +0100
638@@ -20,7 +20,7 @@
639 */
640 #include "mp3if.h"
641 #include <mp4av/mp4av.h>
642-#include <mp4v2/mp4.h>
626301c0 643+#include <mp4v2/mp4v2.h>
ee000417
JB		 644 #include <mpeg2t/mpeg2_transport.h>
645 #include <mpeg2ps/mpeg2_ps.h>
646
647--- mpeg4ip-1.6.1/player/src/codec/mpeg4/Makefile.am.orig 2007-09-18 22:52:19.000000000 +0200
648+++ mpeg4ip-1.6.1/player/src/codec/mpeg4/Makefile.am 2012-12-07 17:01:51.286967533 +0100
649@@ -29,7 +29,7 @@
650 -I$(top_srcdir)/$(mpeg4_dir)/include \
651 -I$(top_srcdir)/include \
652 -I$(top_srcdir)/lib \
653- -I$(top_srcdir)/lib/mp4v2 \
654+ -I/usr/include/mp4v2 \
655 -I$(top_srcdir)/lib/sdp
656
657 AM_CFLAGS = -D_REENTRANT -fexceptions @BILLS_CWARNINGS@ -D__TRACE_AND_STATS_ -D__DOUBLE_PRECISION_ -D_OBSS_
658--- mpeg4ip-1.6.1/player/src/codec/mpeg4/mpeg4.cpp.orig 2007-03-29 20:52:19.000000000 +0200
659+++ mpeg4ip-1.6.1/player/src/codec/mpeg4/mpeg4.cpp 2012-12-07 17:03:30.056965474 +0100
660@@ -41,7 +41,7 @@
661 #include <vopsedec.hpp>
662 #include "mpeg4.h"
663
664-#include <mp4v2/mp4.h>
626301c0 665+#include <mp4v2/mp4v2.h>
ee000417
JB		 666 #include <mp4av/mp4av.h>
667
668 #define iso_message (iso->m_vft->log_msg)
669--- mpeg4ip-1.6.1/player/src/mp4_bytestream.h.orig 2007-01-30 22:53:44.000000000 +0100
670+++ mpeg4ip-1.6.1/player/src/mp4_bytestream.h 2012-12-07 17:07:19.340294028 +0100
671@@ -24,7 +24,7 @@
672
673 #ifndef __MP4_BYTESTREAM_H__
674 #define __MP4_BYTESTREAM_H__
675-#include <mp4.h>
626301c0 676+#include <mp4v2/mp4v2.h>
ee000417
JB		 677 #include <ismacryplib.h>
678 #include "our_bytestream.h"
679 #include "mp4_file.h"
680--- mpeg4ip-1.6.1/lib/srtp/liblibsrtp.c.orig 2006-08-07 20:27:04.000000000 +0200
681+++ mpeg4ip-1.6.1/lib/srtp/liblibsrtp.c 2012-12-07 17:48:18.803576099 +0100
682@@ -19,7 +19,7 @@
683
684 #include "liblibsrtp.h"
685 #include "rtp.h"
686-#include "mp4.h"
626301c0 687+#include <mp4v2/mp4v2.h>
ee000417
JB		 688 #include <assert.h>
689 #include "mutex.h"
690
691--- mpeg4ip-1.6.1/player/plugin/audio/celp/Makefile.am.orig 2012-12-06 18:38:25.648647606 +0100
692+++ mpeg4ip-1.6.1/player/plugin/audio/celp/Makefile.am 2012-12-07 19:53:52.206752412 +0100
693@@ -10,7 +10,7 @@
694 $(top_builddir)/player/lib/audio/celp/BS/libmpeg4ip_celpbs.la \
695 $(top_builddir)/player/lib/audio/celp/dec/libmpeg4ip_celp.la
696
697-INCLUDES = -I$(top_srcdir)/player/src -I$(top_srcdir)/player/lib -I$(top_srcdir)/include -I$(top_srcdir)/lib -I$(top_srcdir)/player/lib/audio/celp -I$(top_srcdir)/player/lib/audio/celp/BS -I$(top_srcdir)/player/lib/audio/celp/dec -I$(top_srcdir)/player/lib/audio/celp/include -I$(top_srcdir)/lib/mp4av -I$(top_srcdir)/lib/sdp -I$(top_srcdir)/lib/mp4v2
698+INCLUDES = -I$(top_srcdir)/player/src -I$(top_srcdir)/player/lib -I$(top_srcdir)/include -I$(top_srcdir)/lib -I$(top_srcdir)/player/lib/audio/celp -I$(top_srcdir)/player/lib/audio/celp/BS -I$(top_srcdir)/player/lib/audio/celp/dec -I$(top_srcdir)/player/lib/audio/celp/include -I$(top_srcdir)/lib/mp4av -I$(top_srcdir)/lib/sdp -I/usr/include/mp4v2
699
700 AM_CFLAGS = -D_REENTRANT -fexceptions @BILLS_CWARNINGS@
701
702--- mpeg4ip-1.6.1/player/plugin/audio/celp/celp.cpp.orig 2006-08-07 20:27:05.000000000 +0200
703+++ mpeg4ip-1.6.1/player/plugin/audio/celp/celp.cpp 2012-12-07 20:02:09.063408724 +0100
704@@ -28,7 +28,7 @@
705
706 #include <mp4util/mpeg4_audio_config.h>
707 #include <mp4util/mpeg4_sdp.h>
708-#include <mp4v2/mp4.h>
626301c0 709+#include <mp4v2/mp4v2.h>
ee000417
JB		 710 #include <mp4av/mp4av.h>
711
712 #define DEBUG_SYNC 2
713--- mpeg4ip-1.6.1/player/plugin/audio/g711/ourg711.cpp.orig 2005-04-22 21:20:43.000000000 +0200
714+++ mpeg4ip-1.6.1/player/plugin/audio/g711/ourg711.cpp 2012-12-07 20:05:52.480070735 +0100
715@@ -20,7 +20,7 @@
716 */
717 #include "ourg711.h"
718 #include "mp4av.h"
719-#include <mp4v2/mp4.h>
626301c0 720+#include <mp4v2/mp4v2.h>
ee000417
JB		 721 #define LOGIT g711->m_vft->log_msg
722 static int16_t alaw2linear(uint8_t a_val);
723 static int16_t ulaw2linear(uint8_t u_val);
724--- mpeg4ip-1.6.1/player/plugin/audio/a52dec/Makefile.am.orig 2004-10-29 00:44:18.000000000 +0200
725+++ mpeg4ip-1.6.1/player/plugin/audio/a52dec/Makefile.am 2012-12-07 20:06:29.470069963 +0100
726@@ -9,7 +9,7 @@
727 $(top_builddir)/lib/mp4av/libmp4av.la
728
729
730-INCLUDES = -I$(top_srcdir)/player/src -I$(top_src_dir)/player/lib -I$(top_srcdir)/include -I$(top_srcdir)/lib -I$(top_srcdir)/lib/sdp -I$(top_srcdir)/lib/mp4v2
731+INCLUDES = -I$(top_srcdir)/player/src -I$(top_src_dir)/player/lib -I$(top_srcdir)/include -I$(top_srcdir)/lib -I$(top_srcdir)/lib/sdp -I/usr/include/mp4v2
732
733 AM_CFLAGS = -D_REENTRANT -fexceptions @BILLS_CWARNINGS@
734
735--- mpeg4ip-1.6.1/player/plugin/audio/a52dec/a52dec.cpp.orig 2006-02-09 18:57:29.000000000 +0100
736+++ mpeg4ip-1.6.1/player/plugin/audio/a52dec/a52dec.cpp 2012-12-07 20:10:05.186732134 +0100
737@@ -19,7 +19,7 @@
738 * Bill May wmay@cisco.com
739 */
740 #include "a52dec.h"
741-#include <mp4v2/mp4.h>
626301c0 742+#include <mp4v2/mp4v2.h>
ee000417
JB		 743 #include <mp4av/mp4av.h>
744 #include <mpeg2ps/mpeg2_ps.h>
745 #define LOGIT a52dec->m_vft->log_msg
746--- mpeg4ip-1.6.1/player/plugin/audio/ffmpeg/Makefile.am.orig 2007-01-22 18:31:13.000000000 +0100
747+++ mpeg4ip-1.6.1/player/plugin/audio/ffmpeg/Makefile.am 2012-12-07 20:10:56.326731066 +0100
748@@ -26,7 +26,7 @@
749 -I$(top_srcdir)/lib \
750 -I$(top_srcdir)/lib/ffmpeg \
751 -I$(top_srcdir)/lib/mp4av \
752- -I$(top_srcdir)/lib/mp4v2 \
753+ -I/usr/include/mp4v2 \
754 -I$(top_srcdir)/lib/sdp \
755 @FFMPEG_INC@
756
757--- mpeg4ip-1.6.1/player/plugin/video/mpeg2dec/Makefile.am.orig 2004-03-16 00:56:31.000000000 +0100
758+++ mpeg4ip-1.6.1/player/plugin/video/mpeg2dec/Makefile.am 2012-12-07 20:11:38.640063520 +0100
759@@ -9,7 +9,7 @@
760 $(top_builddir)/lib/mp4av/libmp4av.la \
761 -lmpeg2
762
763-INCLUDES = -I$(top_srcdir)/player/src -I$(top_srcdir)/player/lib -I$(top_srcdir)/include -I$(top_srcdir)/lib -I$(top_srcdir)/lib/mp4av -I$(top_srcdir)/lib/mp4v2 -I$(top_srcdir)/lib/sdp
764+INCLUDES = -I$(top_srcdir)/player/src -I$(top_srcdir)/player/lib -I$(top_srcdir)/include -I$(top_srcdir)/lib -I$(top_srcdir)/lib/mp4av -I/usr/include/mp4v2 -I$(top_srcdir)/lib/sdp
765
766 AM_CFLAGS = -D_REENTRANT -fexceptions @BILLS_CWARNINGS@
767
768--- mpeg4ip-1.6.1/player/plugin/video/xvid/Makefile.am.orig 2005-08-22 22:18:27.000000000 +0200
769+++ mpeg4ip-1.6.1/player/plugin/video/xvid/Makefile.am 2012-12-07 20:20:12.160052815 +0100
770@@ -46,7 +46,7 @@
771 $(top_builddir)/lib/mp4av/libmp4av.la
772
773 endif
774-INCLUDES = -I$(top_srcdir)/player/lib -I$(top_srcdir)/include -I$(top_srcdir)/lib -I$(top_srcdir)/player/src -I$(top_srcdir)/lib/mp4v2 -I$(top_srcdir)/lib/sdp -I$(top_srcdir)/lib/mp4av
775+INCLUDES = -I$(top_srcdir)/player/lib -I$(top_srcdir)/include -I$(top_srcdir)/lib -I$(top_srcdir)/player/src -I/usr/include/mp4v2 -I$(top_srcdir)/lib/sdp -I$(top_srcdir)/lib/mp4av
776
777
778 AM_CFLAGS = -D_REENTRANT -fexceptions @BILLS_CWARNINGS@
779--- mpeg4ip-1.6.1/player/plugin/video/xvid/xvid1_0.cpp.orig 2007-03-29 20:52:18.000000000 +0200
780+++ mpeg4ip-1.6.1/player/plugin/video/xvid/xvid1_0.cpp 2012-12-07 20:20:49.316718706 +0100
781@@ -25,7 +25,7 @@
782 #include "ourxvid.h"
783 #include "codec_plugin.h"
784 #include <mp4util/mpeg4_sdp.h>
785-#include <mp4v2/mp4.h>
626301c0 786+#include <mp4v2/mp4v2.h>
ee000417
JB		 787 #include <xvid.h>
788 #include <mp4av/mp4av.h>
789
790--- mpeg4ip-1.6.1/player/lib/mp4util/h264_sdp.h.orig 2004-10-29 00:44:18.000000000 +0200
791+++ mpeg4ip-1.6.1/player/lib/mp4util/h264_sdp.h 2012-12-07 20:34:38.653368088 +0100
792@@ -23,7 +23,7 @@
793 #define __H264_SDP_H__ 1
794
795 #include "mpeg4ip.h"
796-#include "mp4.h"
626301c0 797+#include <mp4v2/mp4v2.h>
ee000417
JB		 798 #ifdef __cplusplus
799 extern "C" {
800 #endif
801--- mpeg4ip-1.6.1/player/plugin/rtp/rfc3267/Makefile.am.orig 2005-08-22 22:18:27.000000000 +0200
802+++ mpeg4ip-1.6.1/player/plugin/rtp/rfc3267/Makefile.am 2012-12-07 20:35:50.320033261 +0100
803@@ -16,7 +16,7 @@
804 -I$(top_srcdir)/include \
805 -I$(top_srcdir)/lib/sdp \
806 -I$(top_srcdir)/lib/rtp \
807- -I$(top_srcdir)/lib/mp4v2 \
808+ -I/usr/include/mp4v2 \
809 -I$(top_srcdir)/lib/gnu \
810 -I$(top_srcdir)/lib/mp4av
811
812--- mpeg4ip-1.6.1/server/mp4creator/mp4creator.h.orig 2005-02-22 23:56:53.000000000 +0100
813+++ mpeg4ip-1.6.1/server/mp4creator/mp4creator.h 2012-12-07 21:43:14.789948965 +0100
814@@ -24,7 +24,7 @@
815 #define __MP4CREATOR_INCLUDED__
816
817 #include <mpeg4ip.h>
818-#include <mp4.h>
626301c0 819+#include <mp4v2/mp4v2.h>
ee000417
JB		 820 #include <mp4av.h>
821 #include <ismacryplib.h>
822
823@@ -55,7 +55,7 @@
824 #endif
825
826 MP4CREATOR_GLOBAL char* ProgName;
827-MP4CREATOR_GLOBAL u_int32_t Verbosity;
828+MP4CREATOR_GLOBAL MP4LogLevel Verbosity;
829 MP4CREATOR_GLOBAL double VideoFrameRate;
830 MP4CREATOR_GLOBAL u_int32_t Mp4TimeScale;
831 MP4CREATOR_GLOBAL bool TimeScaleSpecified;
832--- mpeg4ip-1.6.1/server/mp4creator/h264.cpp.orig 2006-10-24 00:26:43.000000000 +0200
833+++ mpeg4ip-1.6.1/server/mp4creator/h264.cpp 2012-12-07 21:59:30.479928624 +0100
834@@ -359,10 +359,9 @@ MP4TrackId H264Creator (MP4FileHandle mp
835 }
836
837 if (MP4GetNumberOfTracks(mp4File, MP4_VIDEO_TRACK_TYPE) == 1) {
838- uint32_t new_verb = Verbosity & ~(MP4_DETAILS_ERROR);
839- MP4SetVerbosity(mp4File, new_verb);
840+ MP4LogSetLevel(MP4_LOG_NONE);
841 MP4SetVideoProfileLevel(mp4File, 0x7f);
842- MP4SetVerbosity(mp4File, Verbosity);
843+ MP4LogSetLevel(Verbosity);
844 }
845
846 uint8_t *nal_buffer;
847@@ -431,7 +430,7 @@ MP4TrackId H264Creator (MP4FileHandle mp
848 }
849 }
850 bool copy_nal_to_buffer = false;
851- if (Verbosity & MP4_DETAILS_SAMPLE) {
852+ if (Verbosity >= MP4_LOG_VERBOSE2) {
853 printf("H264 type %x size %u\n",
854 h264_dec.nal_unit_type, nal.buffer_on);
855 }
856--- mpeg4ip-1.6.1/server/mp4creator/mp4creator.cpp.orig 2007-01-30 22:53:44.000000000 +0100
857+++ mpeg4ip-1.6.1/server/mp4creator/mp4creator.cpp 2012-12-07 22:10:24.436581663 +0100
858@@ -148,7 +148,7 @@ int main(int argc, char** argv)
859 char* p3gppSupportedBrands[2] = {"3gp5", "3gp4"};
860 uint32_t newverbosity;
861
862- Verbosity = MP4_DETAILS_ERROR;
863+ Verbosity = MP4_LOG_ERROR;
864 VideoFrameRate = 0; // determine from input file
865 TimeScaleSpecified = false;
866 Mp4TimeScale = 90000;
867@@ -385,21 +385,21 @@ int main(int argc, char** argv)
868 createFlags |= MP4_CREATE_64BIT_TIME;
869 break;
870 case 'v':
871- Verbosity |= (MP4_DETAILS_READ | MP4_DETAILS_WRITE);
872+ Verbosity = MP4_LOG_INFO;
873 if (optarg) {
874 u_int32_t level;
875 if (sscanf(optarg, "%u", &level) == 1) {
876 if (level >= 2) {
877- Verbosity |= MP4_DETAILS_TABLE;
878+ Verbosity = MP4_LOG_VERBOSE1;
879 }
880 if (level >= 3) {
881- Verbosity |= MP4_DETAILS_SAMPLE;
882+ Verbosity = MP4_LOG_VERBOSE2;
883 }
884 if (level >= 4) {
885- Verbosity |= MP4_DETAILS_HINT;
886+ Verbosity = MP4_LOG_VERBOSE3;
887 }
888 if (level >= 5) {
889- Verbosity = MP4_DETAILS_ALL;
890+ Verbosity = MP4_LOG_VERBOSE4;
891 }
892 }
893 }
894@@ -426,6 +426,7 @@ int main(int argc, char** argv)
895 exit(EXIT_COMMAND_LINE);
896 }
897
898+ MP4LogSetLevel(Verbosity);
899 if ((argc - optind) == 1) {
900 mp4FileName = argv[optind++];
901 } else {
902@@ -515,7 +516,6 @@ int main(int argc, char** argv)
903
904 if ((!strcmp(extension, ".amr")) || (!strcmp(extension, ".263"))) {
905 mp4File = MP4CreateEx(mp4FileName,
906- Verbosity,
907 createFlags,
908 1, // add ftyp atom
909 0, // don't add iods
910@@ -524,7 +524,7 @@ int main(int argc, char** argv)
911 p3gppSupportedBrands,
912 sizeof(p3gppSupportedBrands) / sizeof(p3gppSupportedBrands[0]));
913 } else {
914- mp4File = MP4Create(mp4FileName, Verbosity,
915+ mp4File = MP4Create(mp4FileName,
916 createFlags);
917 }
918 if (mp4File) {
919@@ -546,7 +546,7 @@ int main(int argc, char** argv)
920 fprintf(stderr, "Must specify 64 bits on new file only");
921 exit(EXIT_CREATE_FILE);
922 }
923- mp4File = MP4Modify(mp4FileName, Verbosity);
924+ mp4File = MP4Modify(mp4FileName, 0);
925 }
926
927 if (!mp4File) {
928@@ -574,13 +574,12 @@ int main(int argc, char** argv)
929 MP4GetTrackType(mp4File, *pTrackId);
930 // look for objectTypeId (GetTrackEsdsObjectTypeId)
931 uint64_t temp;
932- newverbosity = Verbosity & ~(MP4_DETAILS_ERROR);
933- MP4SetVerbosity(mp4File, newverbosity);
934+ MP4LogSetLevel(MP4_LOG_NONE);
935 bool ret =
936 MP4GetTrackIntegerProperty(mp4File, *pTrackId,
937 "mdia.minf.stbl.stsd.*.esds.decConfigDescr.objectTypeId",
938 &temp);
939- MP4SetVerbosity(mp4File, Verbosity);
940+ MP4LogSetLevel(Verbosity);
941 if (ret) {
942 if (!strcmp(type, MP4_AUDIO_TRACK_TYPE)) {
943 allMpeg4Streams &=
944@@ -624,20 +623,18 @@ int main(int argc, char** argv)
945 "mdia.minf.stbl.stsd.*.esds.decConfigDescr.objectTypeId",
946 &temp)) {
947 if (!strcmp(type, MP4_AUDIO_TRACK_TYPE)) {
948- newverbosity = Verbosity & ~(MP4_DETAILS_ERROR);
949- MP4SetVerbosity(mp4File, newverbosity);
950+ MP4LogSetLevel(MP4_LOG_NONE);
951 allMpeg4Streams &=
952 (MP4GetTrackEsdsObjectTypeId(mp4File, trackId)
953 == MP4_MPEG4_AUDIO_TYPE);
954- MP4SetVerbosity(mp4File, Verbosity);
955+ MP4LogSetLevel(Verbosity);
956
957 } else if (!strcmp(type, MP4_VIDEO_TRACK_TYPE)) {
958- newverbosity = Verbosity & ~(MP4_DETAILS_ERROR);
959- MP4SetVerbosity(mp4File, newverbosity);
960+ MP4LogSetLevel(MP4_LOG_NONE);
961 allMpeg4Streams &=
962 (MP4GetTrackEsdsObjectTypeId(mp4File, trackId)
963 == MP4_MPEG4_VIDEO_TYPE);
964- MP4SetVerbosity(mp4File, Verbosity);
965+ MP4LogSetLevel(Verbosity);
966 }
967 }
968 }
969@@ -645,29 +642,30 @@ int main(int argc, char** argv)
970
971 char *buffer;
972 char *value;
973- newverbosity = Verbosity & ~(MP4_DETAILS_ERROR);
974- MP4SetVerbosity(mp4File, newverbosity);
975- bool retval = MP4GetMetadataTool(mp4File, &value);
976- MP4SetVerbosity(mp4File, Verbosity);
977- if (retval && value != NULL) {
978- if (strncasecmp("mp4creator", value, strlen("mp4creator")) != 0) {
979- buffer = (char *)malloc(strlen(value) + 80);
980- sprintf(buffer, "%s mp4creator %s", value, MPEG4IP_VERSION);
981- MP4SetMetadataTool(mp4File, buffer);
982+ const MP4Tags *tags = MP4TagsAlloc();
983+ MP4LogSetLevel(MP4_LOG_NONE);
984+ bool retval = MP4TagsFetch(tags, mp4File);
985+ MP4LogSetLevel(Verbosity);
986+ if (retval && tags->encodingTool != NULL) {
987+ if (strncasecmp("mp4creator", tags->encodingTool, strlen("mp4creator")) != 0) {
988+ buffer = (char *)malloc(strlen(tags->encodingTool) + 80);
989+ sprintf(buffer, "%s mp4creator %s", tags->encodingTool, MPEG4IP_VERSION);
990+ MP4TagsSetEncodingTool(tags, buffer);
991 free(buffer);
992 }
993 } else {
994 buffer = (char *)malloc(80);
995 sprintf(buffer, "mp4creator %s", MPEG4IP_VERSION);
996- MP4SetMetadataTool(mp4File, buffer);
997+ MP4TagsSetEncodingTool(tags, buffer);
998 }
999+ MP4TagsStore(tags, mp4File);
1000+ MP4TagsFree(tags);
1001 bool is3GPP = Is3GPP(mp4File);
1002
1003 MP4Close(mp4File);
1004 if (is3GPP || (force3GPCompliance)) {
1005 // If we created the file, CreateEX already takes care of this...
1006 MP4Make3GPCompliant(mp4FileName,
1007- Verbosity,
1008 p3gppSupportedBrands[0],
1009 0x0001,
1010 p3gppSupportedBrands,
1011@@ -682,7 +680,7 @@ int main(int argc, char** argv)
1012 exit(EXIT_CREATE_FILE);
1013 }
1014
1015- mp4File = MP4Read(mp4FileName, Verbosity);
1016+ mp4File = MP4Read(mp4FileName);
1017 if (!mp4File) {
1018 // mp4 library should have printed a message
1019 exit(EXIT_CREATE_FILE);
1020@@ -695,7 +693,7 @@ int main(int argc, char** argv)
1021 outputFileName = tempName;
1022 }
1023
1024- MP4FileHandle outputFile = MP4CreateEx(outputFileName, Verbosity,
1025+ MP4FileHandle outputFile = MP4CreateEx(outputFileName,
1026 createFlags, true, true);
1027 MP4SetTimeScale(outputFile, Mp4TimeScale);
1028 u_int32_t numTracks = MP4GetNumberOfTracks(mp4File);
1029@@ -799,7 +797,7 @@ int main(int argc, char** argv)
1030 exit(EXIT_CREATE_FILE);
1031 }
1032
1033- mp4File = MP4Read(mp4FileName, Verbosity);
1034+ mp4File = MP4Read(mp4FileName);
1035 if (!mp4File) {
1036 // mp4 library should have printed a message
1037 exit(EXIT_CREATE_FILE);
1038@@ -824,7 +822,7 @@ int main(int argc, char** argv)
1039 exit(EXIT_CREATE_FILE);
1040 }
1041
1042- mp4File = MP4Modify(mp4FileName, Verbosity);
1043+ mp4File = MP4Modify(mp4FileName, 0);
1044 if (!mp4File) {
1045 // mp4 library should have printed a message
1046 exit(EXIT_CREATE_FILE);
1047@@ -838,11 +836,11 @@ int main(int argc, char** argv)
1048 }
1049
1050 if (doIsma) {
1051- MP4MakeIsmaCompliant(mp4FileName, Verbosity);
1052+ MP4MakeIsmaCompliant(mp4FileName, true);
1053 }
1054
1055 if (doOptimize) {
1056- if (!MP4Optimize(mp4FileName, NULL, Verbosity)) {
1057+ if (!MP4Optimize(mp4FileName, NULL)) {
1058 // mp4 library should have printed a message
1059 exit(EXIT_OPTIMIZE_FILE);
1060 }
1061--- mpeg4ip-1.6.1/server/mp4live/mp4live_config.h.orig 2006-09-29 21:55:42.000000000 +0200
1062+++ mpeg4ip-1.6.1/server/mp4live/mp4live_config.h 2012-12-07 22:13:39.899910921 +0100
1063@@ -25,7 +25,7 @@
1064 #define __LIVE_CONFIG_H__
1065
1066 #include <sys/types.h>
1067-#include <mp4.h>
626301c0 1068+#include <mp4v2/mp4v2.h>
ee000417
JB		 1069
1070 #include "mpeg4ip_config_set.h"
1071
1072--- mpeg4ip-1.6.1/server/mp4live/audio_encoder.h.orig 2006-09-29 21:55:42.000000000 +0200
1073+++ mpeg4ip-1.6.1/server/mp4live/audio_encoder.h 2012-12-07 22:24:11.496564423 +0100
1074@@ -25,7 +25,7 @@
1075 #include "media_codec.h"
1076 #include "media_frame.h"
1077 #include <sdp.h>
1078-#include <mp4.h>
626301c0 1079+#include <mp4v2/mp4v2.h>
ee000417
JB		 1080 #include "profile_audio.h"
1081 #include "resampl.h"
1082 #include "encoder_gui_options.h"
4987648a
JB		 1083--- mpeg4ip-1.6.1/server/mp4live/gui/file_utils.cpp.orig 2005-02-22 23:56:53.000000000 +0100
1084+++ mpeg4ip-1.6.1/server/mp4live/gui/file_utils.cpp 2012-12-08 07:46:46.272527535 +0100
1085@@ -23,7 +23,7 @@
1086 #include "mp4live.h"
1087 #include "mp4live_gui.h"
1088
1089-#include <mp4.h>
626301c0 1090+#include <mp4v2/mp4v2.h>
4987648a
JB		 1091 #include "mpeg2_ps.h"
1092
1093 GtkWidget* CreateFileCombo(const char* entryText)
1094--- mpeg4ip-1.6.1/server/mp4live/profile_video.h.orig 2005-09-08 00:28:01.000000000 +0200
1095+++ mpeg4ip-1.6.1/server/mp4live/profile_video.h 2012-12-08 07:47:50.872526189 +0100
1096@@ -21,7 +21,7 @@
1097 #ifndef __PROFILE_VIDEO__
1098 #define __PROFILE_VIDEO__ 1
1099 #include "config_list.h"
1100-#include "mp4.h"
626301c0 1101+#include <mp4v2/mp4v2.h>
4987648a
JB		 1102
1103 #define VIDEO_ENCODER_XVID "xvid"
1104 #define VIDEO_ENCODING_MPEG4 "MPEG4"
1105--- mpeg4ip-1.6.1/server/mp4live/video_encoder.h.orig 2006-05-30 21:48:12.000000000 +0200
1106+++ mpeg4ip-1.6.1/server/mp4live/video_encoder.h 2012-12-08 07:48:26.045858790 +0100
1107@@ -25,7 +25,7 @@
1108 #include "media_codec.h"
1109 #include "media_frame.h"
1110 #include <sdp.h>
1111-#include <mp4.h>
626301c0 1112+#include <mp4v2/mp4v2.h>
4987648a
JB		 1113 #include "profile_video.h"
1114 #include "media_sink.h"
1115 #include "media_feeder.h"
1116--- mpeg4ip-1.6.1/server/mp4live/text_encoder.h.orig 2006-06-08 21:01:58.000000000 +0200
1117+++ mpeg4ip-1.6.1/server/mp4live/text_encoder.h 2012-12-08 07:57:48.655847065 +0100
1118@@ -25,7 +25,7 @@
1119 #include "media_codec.h"
1120 #include "media_frame.h"
1121 #include <sdp.h>
1122-#include <mp4.h>
626301c0 1123+#include <mp4v2/mp4v2.h>
4987648a
JB		 1124 #include "encoder_gui_options.h"
1125 #include "profile_text.h"
1126
1127--- mpeg4ip-1.6.1/server/mp4live/h261/Makefile.am.orig 2006-03-21 00:13:32.000000000 +0100
1128+++ mpeg4ip-1.6.1/server/mp4live/h261/Makefile.am 2012-12-08 07:58:45.875845871 +0100
1129@@ -13,7 +13,7 @@
1130 INCLUDES = -I$(top_srcdir)/server/mp4live \
1131 -I$(top_srcdir)/include \
1132 -I$(top_srcdir)/lib/ \
1133- -I$(top_srcdir)/lib/mp4v2 \
1134+ -I/usr/include/mp4v2 \
1135 -I$(top_srcdir)/lib/mp4av \
1136 -I$(top_srcdir)/lib/msg_queue \
1137 -I$(top_srcdir)/lib/utils \
1138--- mpeg4ip-1.6.1/server/mp4live/audio_faac.cpp.orig 2007-01-22 18:31:28.000000000 +0100
1139+++ mpeg4ip-1.6.1/server/mp4live/audio_faac.cpp 2012-12-08 08:07:22.209168441 +0100
1140@@ -22,7 +22,7 @@
1141 #include "mp4live.h"
1142 #ifdef HAVE_FAAC
1143 #include "audio_faac.h"
1144-#include "mp4.h"
626301c0 1145+#include <mp4v2/mp4v2.h>
4987648a
JB		 1146 #include "mp4av.h"
1147
1148 static const u_int32_t samplingRateAllValues[] = {
1149--- mpeg4ip-1.6.1/server/mp4live/file_mp4_recorder.h.orig 2005-08-29 20:57:11.000000000 +0200
1150+++ mpeg4ip-1.6.1/server/mp4live/file_mp4_recorder.h 2012-12-08 08:11:13.409163623 +0100
1151@@ -23,7 +23,7 @@
1152 #ifndef __FILE_MP4_RECORDER_H__
1153 #define __FILE_MP4_RECORDER_H__
1154
1155-#include <mp4.h>
626301c0 1156+#include <mp4v2/mp4v2.h>
4987648a
JB		 1157 #include <mp4av.h>
1158 #include "media_sink.h"
1159 #include "media_stream.h"
1160--- mpeg4ip-1.6.1/server/mp4live/file_mp4_recorder.cpp.orig 2007-01-30 22:53:45.000000000 +0100
1161+++ mpeg4ip-1.6.1/server/mp4live/file_mp4_recorder.cpp 2012-12-08 19:34:35.861642335 +0100
1162@@ -149,14 +149,11 @@
1163 createFlags |= MP4_CREATE_64BIT_DATA;
1164 }
1165 debug_message("Creating huge file - %s", hugeFile ? "yes" : "no");
1166- u_int32_t verbosity =
1167- MP4_DETAILS_ERROR /*DEBUG | MP4_DETAILS_WRITE_ALL */;
1168
1169 bool create = false;
1170 switch (m_pConfig->GetIntegerValue(CONFIG_RECORD_MP4_FILE_STATUS)) {
1171 case FILE_MP4_APPEND:
1172- m_mp4File = MP4Modify(filename,
1173- verbosity);
1174+ m_mp4File = MP4Modify(filename, 0);
1175 break;
1176 case FILE_MP4_CREATE_NEW: {
1177 struct stat stats;
1178@@ -206,7 +203,6 @@
1179 static char* p3gppSupportedBrands[2] = {"3gp5", "3gp4"};
1180
1181 m_mp4File = MP4CreateEx(m_mp4FileName,
1182- verbosity,
1183 createFlags,
1184 1,
1185 0,
1186@@ -216,7 +212,7 @@
1187 NUM_ELEMENTS_IN_ARRAY(p3gppSupportedBrands));
1188 } else {
1189 m_mp4File = MP4Create(m_mp4FileName,
1190- verbosity, createFlags);
1191+ createFlags);
1192 }
1193 }
1194
1195@@ -225,10 +221,16 @@
1196 }
1197 MP4SetTimeScale(m_mp4File, m_movieTimeScale);
1198
1199+ {
1200+ const MP4Tags *tags = MP4TagsAlloc();
1201+ MP4TagsFetch(tags, m_mp4File);
1202 char buffer[80];
1203 sprintf(buffer, "mp4live version %s %s", MPEG4IP_VERSION,
1204 get_linux_video_type());
1205- MP4SetMetadataTool(m_mp4File, buffer);
1206+ MP4TagsSetEncodingTool(tags, buffer);
1207+ MP4TagsStore(tags, m_mp4File);
1208+ MP4TagsFree(tags);
1209+ }
1210
1211 if (m_recordVideo) {
1212 m_videoFrameNumber = 1;
1213@@ -1228,7 +1230,7 @@
1214 // create hint tracks
1215 if (m_pConfig->GetBoolValue(CONFIG_RECORD_MP4_HINT_TRACKS)) {
1216
1217- m_mp4File = MP4Modify(m_mp4FileName, MP4_DETAILS_ERROR);
1218+ m_mp4File = MP4Modify(m_mp4FileName, 0);
1219
1220 if (m_pConfig->GetBoolValue(CONFIG_RECORD_MP4_OPTIMIZE)) {
1221 optimize = true;
1222@@ -1276,7 +1278,6 @@
1223 if (m_makeIod) {
1224 MP4MakeIsmaCompliant(
1225 m_mp4FileName,
1226- 0,
1227 useIsmaTag);
1228 }
1229 }
1230--- mpeg4ip-1.6.1/server/mp4live/sdp_file.cpp.orig 2006-06-08 21:01:58.000000000 +0200
1231+++ mpeg4ip-1.6.1/server/mp4live/sdp_file.cpp 2012-12-08 20:02:46.621607096 +0100
1232@@ -25,7 +25,7 @@
1233 #include <netinet/in.h>
1234 #include <arpa/inet.h>
1235 #include "sdp.h"
1236-#include "mp4.h"
626301c0 1237+#include <mp4v2/mp4v2.h>
4987648a
JB		 1238 #include "mp4av.h"
1239 #include "audio_encoder.h"
1240 #include "video_encoder.h"
1241@@ -400,12 +400,7 @@
1242 pStream->GetAudioProfile() == NULL ? 0 :
1243 pStream->GetAudioProfile()->GetIntegerValue(CFG_AUDIO_BIT_RATE),
1244 pAudioConfig,
1245- audioConfigLength,
1246-#ifdef DEBUG_IOD
1247- pGlobal->GetBoolValue(CONFIG_APP_DEBUG) ?
1248- MP4_DETAILS_ISMA :
1249-#endif
1250- 0
1251+ audioConfigLength
1252 );
1253
1254 if (iod) {
1255--- mpeg4ip-1.6.1/server/mp4live/video_encoder_base.h.orig 2006-05-30 21:48:12.000000000 +0200
1256+++ mpeg4ip-1.6.1/server/mp4live/video_encoder_base.h 2012-12-08 20:08:45.241599620 +0100
1257@@ -25,7 +25,7 @@
1258 #include "media_codec.h"
1259 #include "media_frame.h"
1260 #include <sdp.h>
1261-#include <mp4.h>
626301c0 1262+#include <mp4v2/mp4v2.h>
4987648a
JB		 1263 #include "video_encoder.h"
1264
1265 void VideoProfileCheckBase(CVideoProfile *vp);
1266--- mpeg4ip-1.6.1/server/mp4live/mp4live.cpp.orig 2006-08-07 20:27:27.000000000 +0200
1267+++ mpeg4ip-1.6.1/server/mp4live/mp4live.cpp 2012-12-08 20:09:33.324931951 +0100
1268@@ -20,7 +20,7 @@
1269 * Bill May wmay@cisco.com
1270 */
1271 #define DECLARE_CONFIG_VARIABLES 1
1272-#include <mp4.h>
626301c0 1273+#include <mp4v2/mp4v2.h>
4987648a
JB		 1274 #include "mp4live.h"
1275 #undef DECLARE_CONFIG_VARIABLES
1276 #include "media_flow.h"
1277--- mpeg4ip-1.6.1/util/mpeg4vol/main.cpp.orig 2005-11-28 23:07:02.000000000 +0100
1278+++ mpeg4ip-1.6.1/util/mpeg4vol/main.cpp 2012-12-08 20:44:48.468221194 +0100
1279@@ -2,7 +2,7 @@
1280
1281
1282 #include "mpeg4ip.h"
1283-#include "mp4v2/mp4.h"
626301c0 1284+#include <mp4v2/mp4v2.h>
4987648a
JB		 1285 #include "mpeg4ip_bitstream.h"
1286 #include "mpeg4ip_getopt.h"
1287
1288@@ -480,15 +480,15 @@
1289 fprintf(stderr, "No decode of audio from mpeg4 files\n");
1290 return -1;
1291 }
1292- mp4File = MP4Read(*argv, MP4_DETAILS_ERROR);
1293+ mp4File = MP4Read(*argv);
1294 if (MP4_IS_VALID_FILE_HANDLE(mp4File)) {
1295 MP4TrackId tid;
1296 uint32_t ix = 0;
1297 do {
1298- uint32_t verb = MP4GetVerbosity(mp4File);
1299- MP4SetVerbosity(mp4File, verb & ~(MP4_DETAILS_ERROR));
1300+ MP4LogLevel verb = MP4LogGetLevel();
1301+ MP4LogSetLevel(MP4_LOG_NONE);
1302 tid = MP4FindTrackId(mp4File, ix, MP4_VIDEO_TRACK_TYPE);
1303- MP4SetVerbosity(mp4File, verb);
1304+ MP4LogSetLevel(verb);
1305 if (MP4_IS_VALID_TRACK_ID(tid)) {
1306 uint8_t type = MP4GetTrackEsdsObjectTypeId(mp4File, tid);
1307 if (type == MP4_MPEG4_VIDEO_TYPE) {
1308--- mpeg4ip-1.6.1/player/src/qtime_file.cpp.orig 2005-10-03 23:13:14.000000000 +0200
1309+++ mpeg4ip-1.6.1/player/src/qtime_file.cpp 2012-12-08 21:14:39.508183868 +0100
1310@@ -34,7 +34,7 @@
1311 #include "our_config_file.h"
1312 #include "codec_plugin.h"
1313 #include "codec_plugin_private.h"
1314-#include <mp4v2/mp4.h>
626301c0 1315+#include <mp4v2/mp4v2.h>
4987648a
JB		 1316
1317 static void close_qt_file (void *data)
1318 {
MPEG4IP - system for encoding, streaming and playing MPEG-4 audio/video
This page took 0.177227 seconds and 4 git commands to generate.