ZM rc1-2666

[linuccio]

error compiling without ffmpeg.

zm_image.cpp: In member function ‘void Image::Blend(const Image&, int) const’:
zm_image.cpp:768: warning: operation on ‘pdest’ may be undefined
mv -f .deps/zm_image.Tpo .deps/zm_image.Po
gcc -DHAVE_CONFIG_H -I. -I.. -I/usr/include -I/usr/include -Wall -Wno-sign-compare -fno-inline -g -O2 -MT zm_jpeg.o -MD -MP -MF .deps/zm_jpeg.Tpo -c -o zm_jpeg.o zm_jpeg.c
mv -f .deps/zm_jpeg.Tpo .deps/zm_jpeg.Po
g++ -DHAVE_CONFIG_H -I. -I.. -I/usr/include -I/usr/include -Wall -Wno-sign-compare -fno-inline -frepo -g -O2 -MT zm_local_camera.o -MD -MP -MF .deps/zm_local_camera.Tpo -c -o zm_local_camera.o zm_local_camera.cpp
mv -f .deps/zm_local_camera.Tpo .deps/zm_local_camera.Po
g++ -DHAVE_CONFIG_H -I. -I.. -I/usr/include -I/usr/include -Wall -Wno-sign-compare -fno-inline -frepo -g -O2 -MT zm_monitor.o -MD -MP -MF .deps/zm_monitor.Tpo -c -o zm_monitor.o zm_monitor.cpp
zm_sdp.h:56: error: redefinition of ‘struct rtp_payload_data_s’
/usr/local/include/ffmpeg/rtp.h:69: error: previous definition of ‘struct rtp_payload_data_s’
zm_sdp.h:80: error: invalid type in declaration before ‘;’ token
zm_sdp.h:80: error: conflicting declaration ‘typedef int rtp_payload_data_t’
/usr/local/include/ffmpeg/rtp.h:92: error: ‘rtp_payload_data_t’ has a previous declaration as ‘typedef struct rtp_payload_data_s rtp_payload_data_t’
make[2]: *** [zm_monitor.o] Error 1
make[2]: Leaving directory `/root/ZoneMinder-1.24.0/src'
make[1]: *** [all-recursive] Error 1
make[1]: Leaving directory `/root/ZoneMinder-1.24.0'
make: *** [all] Error 2


rtp.h?

[cordel]

ffmpeg is required at the moment in 1.24.0 rc1.
whether of not this will change is yet to be announced.

[linuccio]

Thank you Cordel.

[zoneminder]

Updated in latest RC to allow compilation without ffmpeg or with latest one.

[linuccio]

thanks Phil