mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-01-22 07:08:23 +00:00
Code Issues 1 Projects Releases Wiki Activity

avviddec: fix signed/unsigned comparisons

Browse source 
https://bugzilla.gnome.org/show_bug.cgi?id=792900
This commit is contained in:
Mathieu Duponchelle 2018-06-30 02:18:43 +02:00
parent d191fb2e50
commit 965cd81603
2 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
ext/libav/gstavviddec.c
View file

@ -307,7 +307,7 @@ static gboolean
gst_ffmpegviddec_close (GstFFMpegVidDec * ffmpegdec, gboolean reset) gst_ffmpegviddec_close (GstFFMpegVidDec * ffmpegdec, gboolean reset)
{ {
GstFFMpegVidDecClass *oclass; GstFFMpegVidDecClass *oclass;
gint i; guint i;
oclass = (GstFFMpegVidDecClass *) (G_OBJECT_GET_CLASS (ffmpegdec)); oclass = (GstFFMpegVidDecClass *) (G_OBJECT_GET_CLASS (ffmpegdec));
@ -343,7 +343,7 @@ static gboolean
gst_ffmpegviddec_open (GstFFMpegVidDec * ffmpegdec) gst_ffmpegviddec_open (GstFFMpegVidDec * ffmpegdec)
{ {
GstFFMpegVidDecClass *oclass; GstFFMpegVidDecClass *oclass;
gint i; guint i;
oclass = (GstFFMpegVidDecClass *) (G_OBJECT_GET_CLASS (ffmpegdec)); oclass = (GstFFMpegVidDecClass *) (G_OBJECT_GET_CLASS (ffmpegdec));
@ -664,7 +664,7 @@ gst_ffmpegviddec_ensure_internal_pool (GstFFMpegVidDec * ffmpegdec,
GstVideoFormat format; GstVideoFormat format;
GstCaps *caps; GstCaps *caps;
GstStructure *config; GstStructure *config;
gint i; guint i;
if (ffmpegdec->internal_pool != NULL && if (ffmpegdec->internal_pool != NULL &&
ffmpegdec->pool_width == picture->width && ffmpegdec->pool_width == picture->width &&
@ -729,7 +729,7 @@ gst_ffmpegviddec_get_buffer2 (AVCodecContext * context, AVFrame * picture,
GstVideoCodecFrame *frame; GstVideoCodecFrame *frame;
GstFFMpegVidDecVideoFrame *dframe; GstFFMpegVidDecVideoFrame *dframe;
GstFFMpegVidDec *ffmpegdec; GstFFMpegVidDec *ffmpegdec;
gint c; guint c;
GstFlowReturn ret; GstFlowReturn ret;
ffmpegdec = (GstFFMpegVidDec *) context->opaque; ffmpegdec = (GstFFMpegVidDec *) context->opaque;
@ -1369,7 +1369,7 @@ get_output_buffer (GstFFMpegVidDec * ffmpegdec, GstVideoCodecFrame * frame)
AVFrame pic, *outpic; AVFrame pic, *outpic;
GstVideoFrame vframe; GstVideoFrame vframe;
GstVideoInfo *info; GstVideoInfo *info;
gint c; guint c;
GST_LOG_OBJECT (ffmpegdec, "get output buffer"); GST_LOG_OBJECT (ffmpegdec, "get output buffer");
@ -1561,8 +1561,8 @@ gst_ffmpegviddec_video_frame (GstFFMpegVidDec * ffmpegdec,
GstVideoMeta *vmeta = gst_buffer_get_video_meta (out_frame->output_buffer); GstVideoMeta *vmeta = gst_buffer_get_video_meta (out_frame->output_buffer);
if (vmeta) { if (vmeta) {
GstVideoInfo *info = &ffmpegdec->output_state->info; GstVideoInfo *info = &ffmpegdec->output_state->info;
g_assert (vmeta->width == GST_VIDEO_INFO_WIDTH (info)); g_assert ((gint) vmeta->width == GST_VIDEO_INFO_WIDTH (info));
g_assert (vmeta->height == GST_VIDEO_INFO_HEIGHT (info)); g_assert ((gint) vmeta->height == GST_VIDEO_INFO_HEIGHT (info));
} }
} }
#endif #endif
@ -1992,7 +1992,7 @@ gst_ffmpegviddec_decide_allocation (GstVideoDecoder * decoder, GstQuery * query)
if (ret == GST_FLOW_OK) { if (ret == GST_FLOW_OK) {
GstVideoMeta *vmeta = gst_buffer_get_video_meta (tmp); GstVideoMeta *vmeta = gst_buffer_get_video_meta (tmp);
gboolean same_stride = TRUE; gboolean same_stride = TRUE;
gint i; guint i;
for (i = 0; i < vmeta->n_planes; i++) { for (i = 0; i < vmeta->n_planes; i++) {
if (vmeta->stride[i] != ffmpegdec->stride[i]) { if (vmeta->stride[i] != ffmpegdec->stride[i]) {

2
ext/libav/gstavviddec.h
View file

@ -60,7 +60,7 @@ struct _GstFFMpegVidDec
GstBuffer *palette; GstBuffer *palette;
guint8 *padded; guint8 *padded;
guint padded_size; gint padded_size;
/* some properties */ /* some properties */
enum AVDiscard skip_frame; enum AVDiscard skip_frame;