diff options
| author | Sebastian Dröge <slomo@circular-chaos.org> | 2013-07-25 14:11:28 +0200 |
|---|---|---|
| committer | Tim-Philipp Müller <tim.muller@collabora.co.uk> | 2013-07-26 15:47:22 +0100 |
| commit | b19b25050677ef59dc1cc03feff8aee0bad5374f (patch) | |
| tree | e5ad7730848e9a6e0147064c564a03de1fe64738 | |
| parent | d11092d478aa9118d0b6aebcfebeedd06e7bc12e (diff) | |
| download | gstreamer-plugins-base-b19b25050677ef59dc1cc03feff8aee0bad5374f.tar.gz | |
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.
| -rw-r--r-- | gst-libs/gst/audio/gstaudiodecoder.h | 4 | ||||
| -rw-r--r-- | 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 27e1fab6b..cc022b9e2 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 8e2b7c705..8d314b44d 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 |