diff options
| author | Seungha Yang <seungha.yang@navercorp.com> | 2019-02-11 21:21:52 +0900 |
|---|---|---|
| committer | Seungha Yang <seungha.yang@navercorp.com> | 2019-02-11 21:21:52 +0900 |
| commit | f1d5f1faab97b63f5ce0a38996196fb2aec94672 (patch) | |
| tree | cfeb3c42f990b2e2441c3c09e178ddd3e44e3a23 | |
| parent | 6eda64430363955f5873a4ae63da92f9c21f7af3 (diff) | |
| download | gstreamer-plugins-bad-f1d5f1faab97b63f5ce0a38996196fb2aec94672.tar.gz | |
openh264dec: Fix build with msvc
Fix following build error
../subprojects/gst-plugins-bad/ext/openh264/gstopenh264dec.cpp(76): error C2121:
Note that msvc usually complains #if inside macro
| -rw-r--r-- | ext/openh264/gstopenh264dec.cpp | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/ext/openh264/gstopenh264dec.cpp b/ext/openh264/gstopenh264dec.cpp index a8a3f90b3..0f46d7c27 100644 --- a/ext/openh264/gstopenh264dec.cpp +++ b/ext/openh264/gstopenh264dec.cpp @@ -60,19 +60,20 @@ static GstFlowReturn gst_openh264dec_handle_frame (GstVideoDecoder * decoder, static gboolean gst_openh264dec_decide_allocation (GstVideoDecoder * decoder, GstQuery * query); -/* pad templates */ +#if HAVE_OPENH264_MAIN_PROFILE +#define SUPPORTED_PROFILE_STR "profile=(string){ constrained-baseline, baseline, main, high }" +#else +#define SUPPORTED_PROFILE_STR "profile=(string){ constrained-baseline, baseline }" +#endif +/* pad templates */ static GstStaticPadTemplate gst_openh264dec_sink_template = GST_STATIC_PAD_TEMPLATE ("sink", GST_PAD_SINK, GST_PAD_ALWAYS, GST_STATIC_CAPS ("video/x-h264, stream-format=(string)byte-stream, alignment=(string)au, " -#if HAVE_OPENH264_MAIN_PROFILE - "profile=(string){ constrained-baseline, baseline, main, high }" -#else - "profile=(string){ constrained-baseline, baseline }" -#endif + SUPPORTED_PROFILE_STR )); static GstStaticPadTemplate gst_openh264dec_src_template = |