diff options
| author | Sebastian Dröge <sebastian.droege@collabora.co.uk> | 2012-01-25 13:22:43 +0100 |
|---|---|---|
| committer | Sebastian Dröge <sebastian.droege@collabora.co.uk> | 2012-01-25 13:22:43 +0100 |
| commit | a2a430024136fd947637ff56a4fea6a2689ca59d (patch) | |
| tree | 8cab3177242814f02b1e49a51d81b5f2f1660621 /gst/mve | |
| parent | 071c6e8f15f2afff7ca4ce5934c3bae1d76aea95 (diff) | |
| parent | 8fb0beaf00aeae2ef6081d08f0d74d6e655a53da (diff) | |
| download | gstreamer-plugins-bad-a2a430024136fd947637ff56a4fea6a2689ca59d.tar.gz | |
Merge branch 'master' into 0.11
Conflicts:
configure.ac
ext/kate/gstkateenc.c
gst/colorspace/colorspace.c
gst/mpegvideoparse/mpegvideoparse.c
Diffstat (limited to 'gst/mve')
| -rw-r--r-- | gst/mve/gstmvemux.c | 2 | ||||
| -rw-r--r-- | gst/mve/mvevideoenc16.c | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/gst/mve/gstmvemux.c b/gst/mve/gstmvemux.c index e6c2fcb6c..3bf07b01e 100644 --- a/gst/mve/gstmvemux.c +++ b/gst/mve/gstmvemux.c @@ -337,7 +337,7 @@ static void gst_mve_mux_palette_analyze (GstMveMux * mvemux, const GstBuffer * pal, guint16 * first, guint16 * last) { - guint i; + gint i; guint32 *col1; col1 = (guint32 *) GST_BUFFER_DATA (pal); diff --git a/gst/mve/mvevideoenc16.c b/gst/mve/mvevideoenc16.c index ec82523dc..d94e3daca 100644 --- a/gst/mve/mvevideoenc16.c +++ b/gst/mve/mvevideoenc16.c @@ -285,6 +285,9 @@ mve_quantize (const GstMveMux * mve, const guint16 * src, } } + if (G_UNLIKELY (!best)) + continue; + ++best->hits; best->r_total += r; best->g_total += g; |