mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-10-04 09:42:19 +00:00
Code Issues 1 Projects Releases Wiki Activity

androidmedia: fix build errors

Browse source 
printf %lld instead of G_GINT64_FORMAT.
Double ret variable declaration.
This commit is contained in:
Matthew Waters 2015-10-21 05:33:13 +11:00
parent 71b4ae1f43
commit c6f2426a7a
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
sys/androidmedia/gstamcvideodec.c
View file

@ -571,7 +571,6 @@ gst_amc_video_dec_set_src_caps (GstAmcVideoDec * self, GstAmcFormat * format)
{ {
GstVideoCodecState *output_state; GstVideoCodecState *output_state;
const gchar *mime; const gchar *mime;
gint ret;
gint color_format, width, height; gint color_format, width, height;
gint stride, slice_height; gint stride, slice_height;
gint crop_left, crop_right; gint crop_left, crop_right;
@ -896,8 +895,8 @@ retry:
flow_ret = gst_pad_push (GST_VIDEO_DECODER_SRC_PAD (self), outbuf); flow_ret = gst_pad_push (GST_VIDEO_DECODER_SRC_PAD (self), outbuf);
} }
} else { } else {
GST_WARNING_OBJECT (self, "No frame available after %lldms", GST_WARNING_OBJECT (self, "No frame available after "
timeout / G_TIME_SPAN_MILLISECOND); "%" G_GINT64_FORMAT "ms", timeout / G_TIME_SPAN_MILLISECOND);
if (frame) { if (frame) {
flow_ret = flow_ret =
@ -1930,7 +1929,8 @@ _find_local_gl_context (GstAmcVideoDec * self)
return TRUE; return TRUE;
query = gst_query_new_context ("gst.gl.local_context"); query = gst_query_new_context ("gst.gl.local_context");
if (!self->gl_context && gst_gl_run_query (GST_ELEMENT (self), query, GST_PAD_SRC)) { if (!self->gl_context
&& gst_gl_run_query (GST_ELEMENT (self), query, GST_PAD_SRC)) {
gst_query_parse_context (query, &context); gst_query_parse_context (query, &context);
if (context) { if (context) {
s = gst_context_get_structure (context); s = gst_context_get_structure (context);
@ -1988,7 +1988,8 @@ gst_amc_video_dec_decide_allocation (GstVideoDecoder * bdec, GstQuery * query)
goto context_error; goto context_error;
} }
} }
} while (!gst_gl_display_add_context (self->gl_display, self->gl_context)); } while (!gst_gl_display_add_context (self->gl_display,
self->gl_context));
GST_OBJECT_UNLOCK (self->gl_display); GST_OBJECT_UNLOCK (self->gl_display);
} }
#endif #endif