ext/ffmpeg/: various compiler fixes

Original commit message from CVS:

* ext/ffmpeg/gstffmpeg.c:
* ext/ffmpeg/gstffmpegcodecmap.c: (gst_ffmpeg_codecid_to_caps):
* ext/ffmpeg/gstffmpegdec.c:
(gst_ffmpegdec_add_pixel_aspect_ratio), (gst_ffmpegdec_frame):
* ext/ffmpeg/gstffmpegprotocol.c: (gst_ffmpegdata_seek):
* ext/ffmpeg/gstffmpegscale.c: (gst_ffmpegscale_transform_caps),
(gst_ffmpegscale_handle_src_event):
various compiler fixes
* ext/ffmpeg/gstffmpegdemux.c: (gst_ffmpegdemux_src_event),
(my_safe_copy), (gst_ffmpegdemux_open),
(gst_ffmpegdemux_change_state):
actually return the result.  Tee hee.
parent 1ef6fec6
2006-04-01 Thomas Vander Stichele <thomas at apestaart dot org>
* ext/ffmpeg/gstffmpeg.c:
* ext/ffmpeg/gstffmpegcodecmap.c: (gst_ffmpeg_codecid_to_caps):
* ext/ffmpeg/gstffmpegdec.c:
(gst_ffmpegdec_add_pixel_aspect_ratio), (gst_ffmpegdec_frame):
* ext/ffmpeg/gstffmpegprotocol.c: (gst_ffmpegdata_seek):
* ext/ffmpeg/gstffmpegscale.c: (gst_ffmpegscale_transform_caps),
(gst_ffmpegscale_handle_src_event):
various compiler fixes
* ext/ffmpeg/gstffmpegdemux.c: (gst_ffmpegdemux_src_event),
(my_safe_copy), (gst_ffmpegdemux_open),
(gst_ffmpegdemux_change_state):
actually return the result. Tee hee.
2006-03-31 Thomas Vander Stichele <thomas at apestaart dot org> 2006-03-31 Thomas Vander Stichele <thomas at apestaart dot org>
* configure.ac: * configure.ac:
......
...@@ -128,6 +128,6 @@ GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, ...@@ -128,6 +128,6 @@ GST_PLUGIN_DEFINE (GST_VERSION_MAJOR,
"ffmpeg", "ffmpeg",
"All FFMPEG codecs", "All FFMPEG codecs",
plugin_init, plugin_init,
GST_FFMPEG_VERSION, "LGPL", "FFMpeg", "http://ffmpeg.sourceforge.net/") PACKAGE_VERSION, "LGPL", "FFMpeg", "http://ffmpeg.sourceforge.net/")
...@@ -739,7 +739,7 @@ gst_ffmpeg_codecid_to_caps (enum CodecID codec_id, ...@@ -739,7 +739,7 @@ gst_ffmpeg_codecid_to_caps (enum CodecID codec_id,
case CODEC_ID_RA_288: case CODEC_ID_RA_288:
case CODEC_ID_COOK: case CODEC_ID_COOK:
{ {
gint version; gint version = 0;
switch (codec_id) { switch (codec_id) {
case CODEC_ID_RA_144: case CODEC_ID_RA_144:
version = 1; version = 1;
...@@ -750,6 +750,8 @@ gst_ffmpeg_codecid_to_caps (enum CodecID codec_id, ...@@ -750,6 +750,8 @@ gst_ffmpeg_codecid_to_caps (enum CodecID codec_id,
case CODEC_ID_COOK: case CODEC_ID_COOK:
version = 8; version = 8;
break; break;
default:
break;
} }
/* FIXME: properties? */ /* FIXME: properties? */
......
...@@ -645,8 +645,8 @@ gst_ffmpegdec_add_pixel_aspect_ratio (GstFFMpegDec * ffmpegdec, ...@@ -645,8 +645,8 @@ gst_ffmpegdec_add_pixel_aspect_ratio (GstFFMpegDec * ffmpegdec,
{ {
gboolean demuxer_par_set = FALSE; gboolean demuxer_par_set = FALSE;
gboolean decoder_par_set = FALSE; gboolean decoder_par_set = FALSE;
gint demuxer_num, demuxer_denom; gint demuxer_num = 1, demuxer_denom = 1;
gint decoder_num, decoder_denom; gint decoder_num = 1, decoder_denom = 1;
GST_OBJECT_LOCK (ffmpegdec); GST_OBJECT_LOCK (ffmpegdec);
...@@ -965,9 +965,9 @@ gst_ffmpegdec_frame (GstFFMpegDec * ffmpegdec, ...@@ -965,9 +965,9 @@ gst_ffmpegdec_frame (GstFFMpegDec * ffmpegdec,
} else if (ffmpegdec->picture->pict_type != -1 && } else if (ffmpegdec->picture->pict_type != -1 &&
oclass->in_plugin->capabilities & CODEC_CAP_DELAY) { oclass->in_plugin->capabilities & CODEC_CAP_DELAY) {
/* update time for skip-frame */ /* update time for skip-frame */
if ((!have_data) || if ((have_data == 0) ||
(iskeyframe || !GST_CLOCK_TIME_IS_VALID (ffmpegdec->next_ts)) ((iskeyframe || !GST_CLOCK_TIME_IS_VALID (ffmpegdec->next_ts))
&& GST_CLOCK_TIME_IS_VALID (*in_ts)) { && GST_CLOCK_TIME_IS_VALID (*in_ts))) {
GST_DEBUG_OBJECT (ffmpegdec, "setting next_ts to *in_ts"); GST_DEBUG_OBJECT (ffmpegdec, "setting next_ts to *in_ts");
ffmpegdec->next_ts = *in_ts; ffmpegdec->next_ts = *in_ts;
*in_ts = GST_CLOCK_TIME_NONE; *in_ts = GST_CLOCK_TIME_NONE;
......
...@@ -382,7 +382,6 @@ gst_ffmpegdemux_src_event (GstPad * pad, GstEvent * event) ...@@ -382,7 +382,6 @@ gst_ffmpegdemux_src_event (GstPad * pad, GstEvent * event)
GstFFMpegDemux *demux = (GstFFMpegDemux *) gst_pad_get_parent (pad); GstFFMpegDemux *demux = (GstFFMpegDemux *) gst_pad_get_parent (pad);
AVStream *stream = gst_ffmpegdemux_stream_from_pad (pad); AVStream *stream = gst_ffmpegdemux_stream_from_pad (pad);
gboolean res = TRUE; gboolean res = TRUE;
gint64 offset;
if (!stream) if (!stream)
return FALSE; return FALSE;
...@@ -680,6 +679,8 @@ my_safe_copy (gchar * input) ...@@ -680,6 +679,8 @@ my_safe_copy (gchar * input)
} else { } else {
output = g_strdup (input); output = g_strdup (input);
} }
return output;
} }
static GstTagList * static GstTagList *
...@@ -810,9 +811,9 @@ gst_ffmpegdemux_open (GstFFMpegDemux * demux) ...@@ -810,9 +811,9 @@ gst_ffmpegdemux_open (GstFFMpegDemux * demux)
/* Send newsegment on all src pads */ /* Send newsegment on all src pads */
for (res = 0; res < demux->context->nb_streams; res++) { for (res = 0; res < demux->context->nb_streams; res++) {
AVStream *stream;
GST_DEBUG_OBJECT (demux, "sending newsegment start:%"GST_TIME_FORMAT" duration:%"GST_TIME_FORMAT, GST_DEBUG_OBJECT (demux, "sending newsegment start:%" GST_TIME_FORMAT
" duration:%" GST_TIME_FORMAT,
GST_TIME_ARGS (demux->segment_start), GST_TIME_ARGS (demux->segment_start),
GST_TIME_ARGS (demux->segment_stop)); GST_TIME_ARGS (demux->segment_stop));
...@@ -1013,6 +1014,8 @@ gst_ffmpegdemux_change_state (GstElement * element, GstStateChange transition) ...@@ -1013,6 +1014,8 @@ gst_ffmpegdemux_change_state (GstElement * element, GstStateChange transition)
case GST_STATE_CHANGE_PAUSED_TO_READY: case GST_STATE_CHANGE_PAUSED_TO_READY:
gst_ffmpegdemux_close (demux); gst_ffmpegdemux_close (demux);
break; break;
default:
break;
} }
return ret; return ret;
......
...@@ -167,7 +167,6 @@ gst_ffmpegdata_write (URLContext * h, unsigned char *buf, int size) ...@@ -167,7 +167,6 @@ gst_ffmpegdata_write (URLContext * h, unsigned char *buf, int size)
static offset_t static offset_t
gst_ffmpegdata_seek (URLContext * h, offset_t pos, int whence) gst_ffmpegdata_seek (URLContext * h, offset_t pos, int whence)
{ {
GstSeekType seek_type = 0;
GstProtocolInfo *info; GstProtocolInfo *info;
guint64 newpos; guint64 newpos;
......
...@@ -161,7 +161,6 @@ static GstCaps * ...@@ -161,7 +161,6 @@ static GstCaps *
gst_ffmpegscale_transform_caps (GstBaseTransform * trans, gst_ffmpegscale_transform_caps (GstBaseTransform * trans,
GstPadDirection direction, GstCaps * caps) GstPadDirection direction, GstCaps * caps)
{ {
GstFFMpegScale *scale = GST_FFMPEGSCALE (trans);
GstCaps *retcaps; GstCaps *retcaps;
int i; int i;
...@@ -375,7 +374,7 @@ gst_ffmpegscale_handle_src_event (GstPad * pad, GstEvent * event) ...@@ -375,7 +374,7 @@ gst_ffmpegscale_handle_src_event (GstPad * pad, GstEvent * event)
event = event =
GST_EVENT (gst_mini_object_make_writable (GST_MINI_OBJECT (event))); GST_EVENT (gst_mini_object_make_writable (GST_MINI_OBJECT (event)));
structure = gst_event_get_structure (event); structure = (GstStructure *) gst_event_get_structure (event);
if (gst_structure_get_double (structure, "pointer_x", &pointer)) { if (gst_structure_get_double (structure, "pointer_x", &pointer)) {
gst_structure_set (structure, gst_structure_set (structure,
"pointer_x", G_TYPE_DOUBLE, "pointer_x", G_TYPE_DOUBLE,
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment