X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Flibzmpeg3%2Flibzmpeg3.h;h=430ebb4d79ed4b40cc80d415b72e7ecc797d0d8e;hb=a4387a272874bd4ed9f010684976f336fa3d0190;hp=6fc2c6c712ff98cc14015466c7d79f897b6d0afa;hpb=e13e0a987ad66b8274fcbaddc71eac583ea80bea;p=goodguy%2Fhistory.git diff --git a/cinelerra-5.1/libzmpeg3/libzmpeg3.h b/cinelerra-5.1/libzmpeg3/libzmpeg3.h index 6fc2c6c7..430ebb4d 100644 --- a/cinelerra-5.1/libzmpeg3/libzmpeg3.h +++ b/cinelerra-5.1/libzmpeg3/libzmpeg3.h @@ -1,5 +1,6 @@ #ifndef LIBMPEG3_H #define LIBMPEG3_H +#ifdef HAVE_LIBZMPEG /* for quicktime build */ #define MAXFRAMESAMPLES 65536 @@ -2846,9 +2847,9 @@ public: } static inline void complete_path(char *full_path, char *path) { - char dir[zmpeg3_t::STRLEN]; + char dir[STRLEN]; if( path[0] != '/' && getcwd(dir, sizeof(dir)) ) - sprintf(full_path, "%s/%s", dir, path); + snprintf(full_path, STRLEN, "%s/%s", dir, path); else strcpy(full_path, path); } @@ -2875,7 +2876,7 @@ public: } static inline void joinpath(char *path, char *dir, char *filename) { - sprintf(path, "%s/%s", dir, filename); + snprintf(path, STRLEN, "%s/%s", dir, filename); } static inline int64_t path_total_bytes(char *path) { @@ -3092,3 +3093,4 @@ int mpeg3_dvb_get_system_time(mpeg3_t *zsrc, int64_t *tm); } #endif #endif +#endif