Skip to content

deinterlace: Add the missing ORC_RESTRICT define.

He Junyan requested to merge He_Junyan/gst-plugins-good:orc_restrict into master

ORC_RESTRICT may not be defined in yadif.c and cause build error.

I get a build error:

ninja: Entering directory `/home/robinhe/media/gst-plugins-good/bb'
[1/2] Compiling C object 'gst/deinterlace/72f069b@@gstdeinterlace@sha/yadif.c.o'.
FAILED: cc -Igst/deinterlace/72f069b@@gstdeinterlace@sha -Igst/deinterlace -I../gst/deinterlace -I. -I../ -I/home/robinhe/media/build/include/gstreamer-1.0 -I/home/robinhe/media/build/include/glib-2.0 -I/home/robinhe/media/build/lib/glib-2.0/include -I/home/robinhe/media/build//include/ -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -Wall -Winvalid-pch -O2 -g -fvisibility=hidden -fno-strict-aliasing -DG_DISABLE_DEPRECATED -Wmissing-declarations -Wredundant-decls -Wwrite-strings -Winit-self -Wmissing-include-dirs -Wno-multichar -Wvla -Wpointer-arith -Wmissing-prototypes -Wdeclaration-after-statement -Wold-style-definition -Waggregate-return -fPIC -pthread -DHAVE_CONFIG_H -MD -MQ 'gst/deinterlace/72f069b@@gstdeinterlace@sha/yadif.c.o' -MF 'gst/deinterlace/72f069b@@gstdeinterlace@sha/yadif.c.o.d' -o 'gst/deinterlace/72f069b@@gstdeinterlace@sha/yadif.c.o' -c ../gst/deinterlace/yadif.c
../gst/deinterlace/yadif.c:91:48: error: expected ‘;’, ‘,’ or ‘)’ before ‘dst’
 filter_line_c_planar_mode0 (void *ORC_RESTRICT dst,
                                                ^
../gst/deinterlace/yadif.c:100:48: error: expected ‘;’, ‘,’ or ‘)’ before ‘dst’
 filter_line_c_planar_mode2 (void *ORC_RESTRICT dst,
                                                ^
../gst/deinterlace/yadif.c:108:49: error: expected ‘;’, ‘,’ or ‘)’ before ‘dst’
 static void (*filter_mode2) (void *ORC_RESTRICT dst,
                                                 ^
../gst/deinterlace/yadif.c:116:49: error: expected ‘;’, ‘,’ or ‘)’ before ‘dst’
 static void (*filter_mode0) (void *ORC_RESTRICT dst,
                                                 ^
../gst/deinterlace/yadif.c:262:42: error: expected ‘;’, ‘,’ or ‘)’ before ‘dst’
 filter_line_c_planar (void *ORC_RESTRICT dst, const void *ORC_RESTRICT tzero,
                                          ^
../gst/deinterlace/yadif.c:298:48: error: expected ‘;’, ‘,’ or ‘)’ before ‘dst’
 filter_line_c_planar_mode0 (void *ORC_RESTRICT dst,
                                                ^
../gst/deinterlace/yadif.c:311:48: error: expected ‘;’, ‘,’ or ‘)’ before ‘dst’
 filter_line_c_planar_mode2 (void *ORC_RESTRICT dst,

Merge request reports