compilation

Author: sfomel

pens/main/gdpen.c

@@ -66,6 +66,7 @@ static AVCodecContext *codec_ctx = NULL;
 static AVFrame *mpeg_frame = NULL;
 #if LIBAVCODEC_VERSION_MAJOR >= 54
 static AVPacket mpeg_pkt;
+static AVPacket *mpeg_pnt = NULL;
 static int mpeg_gout;
 #else
 static int frame_out_size;
@@ -529,14 +530,18 @@ static void ffmpeg_write (void) {
     frame_out_size = avcodec_encode_video (codec_ctx, frame_outbuf,
                                            frame_outbuf_size, mpeg_frame);
     fwrite (frame_outbuf, 1, frame_out_size, pltout);
-#else
+#else 
+#if LIBAVCODEC_VERSION_MAJOR < 58
     av_init_packet (&mpeg_pkt);
     mpeg_pkt.data = NULL;
     mpeg_pkt.size = 0;
-#if LIBAVCODEC_VERSION_MAJOR < 58
     if (avcodec_encode_video2 (codec_ctx, &mpeg_pkt, mpeg_frame, &mpeg_gout) < 0)
         ERR (FATAL, name, "MPEG encoding error\n");
 #else
+    mpeg_pnt = av_packet_alloc();
+    mpeg_pkt = *mpeg_pnt;
+    mpeg_pkt.data = NULL;
+    mpeg_pkt.size = 0;
     if (avcodec_send_frame(codec_ctx, mpeg_frame) < 0)
 	ERR (FATAL, name, "MPEG send frame error\n");
     mpeg_gout = avcodec_receive_packet(codec_ctx, &mpeg_pkt);

pens/main/xtpen.c

@@ -1282,7 +1282,7 @@ void actionGoto(Widget w, XEvent *ev, String *p, Cardinal *np)
 void set_mode_label(const char *newlab)
 { 
     Arg arg[1];
-    char text[32];
+    char text[33];
 
     if( wantLabels ){
 	strncpy( text, newlab, 32 );

system/main/mpi.c

@@ -52,7 +52,7 @@ int main(int argc, char* argv[])
 	commands = sf_split(inp,axis,nodes,&jobs,ndim,n,argc,argv);  
 
 	for (job=0; job < jobs; job++) {
-	    strncpy(cmdline,commands[job],SF_CMDLEN);
+	    memcpy(cmdline,commands[job],SF_CMDLEN);
 	    MPI_Send(cmdline, SF_CMDLEN, MPI_CHAR, job+1, 0, MPI_COMM_WORLD);
 	}
 

system/main/rtoc.c

@@ -55,7 +55,7 @@ int main(int argc, char* argv[])
     cformat = sf_charalloc(strlen(rformat)+1
                            -strlen("float")
                            +strlen("complex"));
-    strncpy(cformat,rformat,strlen(rformat));
+    memcpy(cformat,rformat,strlen(rformat));
     strcpy(strstr(cformat,"float"),"complex");
     sf_setformat(cmplx,cformat);
 

system/seismic/Msegywrite.c

@@ -41,7 +41,8 @@ int main(int argc, char *argv[])
 			      "     http://www.ahay.org/"};
     sf_file in=NULL, hdr=NULL;
     size_t nsegy;
-    int format=1, i, ns, nk, itr, ntr, *itrace=NULL;
+    unsigned int i;
+    int format=1, ns, nk, itr, ntr, *itrace=NULL;
     FILE *head=NULL, *file=NULL;
     float *ftrace=NULL, dt, t0;
 
@@ -96,7 +97,7 @@ int main(int argc, char *argv[])
 	} else {
 	    for (i=0; i < SF_EBCBYTES/80; i++) {
 		snprintf(count,4,"C%-2d",i+1);
-		snprintf(ahead+i*80,81,"%s %-76s\n",count,
+		snprintf(ahead+i*80,82,"%s %-76s\n",count,
 			 (i < 3)? myheader[i]:"");
 	    }
 	    if (verbose) sf_warning("ASCII header created on the fly");