diff options
| author | Tim-Philipp Müller <tim@centricular.com> | 2013-11-29 15:51:49 +0000 |
|---|---|---|
| committer | Tim-Philipp Müller <tim@centricular.com> | 2013-11-29 15:54:55 +0000 |
| commit | 88b27e30c98563deeb74b3032d7701adef89883d (patch) | |
| tree | ee28d6a7f95ec2ca7b695875b0556e4fa8cc9cd2 | |
| parent | 20d6dbd2f620d987737349b9c321bc18d05587e8 (diff) | |
x264enc: fix compiler warning
Compiler warns rightly about possibly uninitialized variable.
| -rw-r--r-- | ext/x264/gstx264enc.c | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/ext/x264/gstx264enc.c b/ext/x264/gstx264enc.c index 8ec88b3d..7a2ea49b 100644 --- a/ext/x264/gstx264enc.c +++ b/ext/x264/gstx264enc.c @@ -1223,44 +1223,35 @@ gst_x264_enc_gst_to_x264_video_format (GstVideoFormat format, gint * nplanes) if (nplanes) *nplanes = 3; return X264_CSP_I420; - break; case GST_VIDEO_FORMAT_I420_10BE: case GST_VIDEO_FORMAT_I420_10LE: if (nplanes) *nplanes = 3; return X264_CSP_I420 | X264_CSP_HIGH_DEPTH; - break; case GST_VIDEO_FORMAT_Y42B: if (nplanes) *nplanes = 3; return X264_CSP_I422; - break; case GST_VIDEO_FORMAT_I422_10BE: case GST_VIDEO_FORMAT_I422_10LE: if (nplanes) *nplanes = 3; return X264_CSP_I422 | X264_CSP_HIGH_DEPTH; - break; case GST_VIDEO_FORMAT_Y444: if (nplanes) *nplanes = 3; return X264_CSP_I444; - break; case GST_VIDEO_FORMAT_Y444_10BE: case GST_VIDEO_FORMAT_Y444_10LE: if (nplanes) *nplanes = 3; return X264_CSP_I444 | X264_CSP_HIGH_DEPTH; - break; case GST_VIDEO_FORMAT_NV12: if (nplanes) *nplanes = 2; return X264_CSP_NV12; - break; default: - g_assert_not_reached (); - return GST_VIDEO_FORMAT_UNKNOWN; - break; + g_return_val_if_reached (GST_VIDEO_FORMAT_UNKNOWN); } } @@ -1947,7 +1938,7 @@ gst_x264_enc_handle_frame (GstVideoEncoder * video_enc, x264_picture_t pic_in; gint i_nal, i; FrameData *fdata; - gint nplanes; + gint nplanes = 0; if (G_UNLIKELY (encoder->x264enc == NULL)) goto not_inited; |