From 99ef452fc474c6df451107ce42f4cd5c538487ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= Date: Thu, 25 Jul 2013 14:11:28 +0200 Subject: [PATCH] audio/videodecoder: Rename variable in macro from dec to __dec Otherwise it might shadow another variable in the outside scope and cause interesting side effects. --- gst-libs/gst/audio/gstaudiodecoder.h | 4 ++-- gst-libs/gst/video/gstvideodecoder.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/gst-libs/gst/audio/gstaudiodecoder.h b/gst-libs/gst/audio/gstaudiodecoder.h index 1ae488fc86..2a1869698c 100644 --- a/gst-libs/gst/audio/gstaudiodecoder.h +++ b/gst-libs/gst/audio/gstaudiodecoder.h @@ -129,8 +129,8 @@ GstFlowReturn _gst_audio_decoder_error (GstAudioDecoder *dec, gint weight, G_STMT_START { \ gchar *__txt = _gst_element_error_printf text; \ gchar *__dbg = _gst_element_error_printf debug; \ - GstAudioDecoder *dec = GST_AUDIO_DECODER (el); \ - ret = _gst_audio_decoder_error (dec, weight, GST_ ## domain ## _ERROR, \ + GstAudioDecoder *__dec = GST_AUDIO_DECODER (el); \ + ret = _gst_audio_decoder_error (__dec, weight, GST_ ## domain ## _ERROR, \ GST_ ## domain ## _ERROR_ ## code, __txt, __dbg, __FILE__, \ GST_FUNCTION, __LINE__); \ } G_STMT_END diff --git a/gst-libs/gst/video/gstvideodecoder.h b/gst-libs/gst/video/gstvideodecoder.h index e5fcacf415..5436d948ec 100644 --- a/gst-libs/gst/video/gstvideodecoder.h +++ b/gst-libs/gst/video/gstvideodecoder.h @@ -148,8 +148,8 @@ GstFlowReturn _gst_video_decoder_error (GstVideoDecoder *dec, gint weight, G_STMT_START { \ gchar *__txt = _gst_element_error_printf text; \ gchar *__dbg = _gst_element_error_printf debug; \ - GstVideoDecoder *dec = GST_VIDEO_DECODER (el); \ - ret = _gst_video_decoder_error (dec, w, GST_ ## domain ## _ERROR, \ + GstVideoDecoder *__dec = GST_VIDEO_DECODER (el); \ + ret = _gst_video_decoder_error (__dec, w, GST_ ## domain ## _ERROR, \ GST_ ## domain ## _ERROR_ ## code, __txt, __dbg, __FILE__, \ GST_FUNCTION, __LINE__); \ } G_STMT_END