FaSTTUBe/GST-Tensordecoder-ov_ep
37
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Fix build on Mac OS X 10.5

Browse Source 
Original commit message from CVS:
2007-11-20  Julien MOUTTE  <julien@moutte.net>

* ext/taglib/gsttaglibmux.c: (gst_tag_lib_mux_render_tag),
(gst_tag_lib_mux_adjust_event_offsets):
* gst/qtdemux/qtdemux.c: (qtdemux_parse_theora_extension):
* sys/osxaudio/Makefile.am:
* sys/osxvideo/cocoawindow.h:
* sys/osxvideo/cocoawindow.m: Fix build on Mac OS X 10.5
This commit is contained in:
Julien Moutte 2007-11-20 11:41:13 +00:00
parent a759157746
commit 1f0a03d320
6 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@ -1,3 +1,12 @@
2007-11-20 Julien MOUTTE <julien@moutte.net>
* ext/taglib/gsttaglibmux.c: (gst_tag_lib_mux_render_tag),
(gst_tag_lib_mux_adjust_event_offsets):
* gst/qtdemux/qtdemux.c: (qtdemux_parse_theora_extension):
* sys/osxaudio/Makefile.am:
* sys/osxvideo/cocoawindow.h:
* sys/osxvideo/cocoawindow.m: Fix build on Mac OS X 10.5
2007-11-15 David Schleef <ds@schleef.org> 2007-11-15 David Schleef <ds@schleef.org>
* ext/cairo/gsttextoverlay.c: * ext/cairo/gsttextoverlay.c:

4
ext/taglib/gsttaglibmux.c
View File

@ -166,7 +166,7 @@ gst_tag_lib_mux_render_tag (GstTagLibMux * mux)
goto render_error; goto render_error;
mux->tag_size = GST_BUFFER_SIZE (buffer); mux->tag_size = GST_BUFFER_SIZE (buffer);
GST_LOG_OBJECT (mux, "tag size = %d bytes", mux->tag_size); GST_LOG_OBJECT (mux, "tag size = %" G_GSIZE_FORMAT " bytes", mux->tag_size);
/* Send newsegment event from byte position 0, so the tag really gets /* Send newsegment event from byte position 0, so the tag really gets
* written to the start of the file, independent of the upstream segment */ * written to the start of the file, independent of the upstream segment */
@ -218,7 +218,7 @@ gst_tag_lib_mux_adjust_event_offsets (GstTagLibMux * mux,
GST_DEBUG_OBJECT (mux, "adjusting newsegment event offsets to start=%" GST_DEBUG_OBJECT (mux, "adjusting newsegment event offsets to start=%"
G_GINT64_FORMAT ", stop=%" G_GINT64_FORMAT ", cur=%" G_GINT64_FORMAT G_GINT64_FORMAT ", stop=%" G_GINT64_FORMAT ", cur=%" G_GINT64_FORMAT
" (delta = +%u)", start, stop, cur, mux->tag_size); " (delta = +%" G_GSIZE_FORMAT ")", start, stop, cur, mux->tag_size);
return gst_event_new_new_segment (TRUE, 1.0, format, start, stop, cur); return gst_event_new_new_segment (TRUE, 1.0, format, start, stop, cur);
} }

3
gst/qtdemux/qtdemux.c
View File

@ -2197,7 +2197,8 @@ qtdemux_parse_theora_extension (GstQTDemux * qtdemux, QtDemuxStream * stream,
break; break;
default: default:
GST_WARNING_OBJECT (qtdemux, GST_WARNING_OBJECT (qtdemux,
"unknown theora cookie %" GST_FOURCC_FORMAT, type); "unknown theora cookie %" GST_FOURCC_FORMAT,
GST_FOURCC_ARGS (type));
break; break;
} }
buf += size; buf += size;

3
sys/osxaudio/Makefile.am
View File

@ -5,7 +5,8 @@ libgstosxaudio_la_SOURCES = gstosxringbuffer.c \
gstosxaudiosink.c \ gstosxaudiosink.c \
gstosxaudiosrc.c gstosxaudiosrc.c
libgstosxaudio_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) libgstosxaudio_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) \
-Wno-deprecated-declarations
libgstosxaudio_la_LIBADD = \ libgstosxaudio_la_LIBADD = \
-lgstinterfaces-@GST_MAJORMINOR@ \ -lgstinterfaces-@GST_MAJORMINOR@ \
-lgstaudio-@GST_MAJORMINOR@ \ -lgstaudio-@GST_MAJORMINOR@ \

2
sys/osxvideo/cocoawindow.h
View File

@ -35,7 +35,7 @@ struct _GstOSXImage;
@interface GstGLView : NSOpenGLView @interface GstGLView : NSOpenGLView
{ {
int i_effect; int i_effect;
unsigned long pi_texture; unsigned int pi_texture;
float f_x; float f_x;
float f_y; float f_y;
int initDone; int initDone;

2
sys/osxvideo/cocoawindow.m
View File

@ -262,7 +262,7 @@
} }
- (void) drawRect:(NSRect) rect { - (void) drawRect:(NSRect) rect {
long params[] = { 1 }; int params[] = { 1 };
[actualContext makeCurrentContext]; [actualContext makeCurrentContext];