Packman Build Service PMBS

File transcode.patch of Package transcode (Revision e7e45c2415eb1dd5c8d3fef0a8ae4342)

Currently displaying revision e7e45c2415eb1dd5c8d3fef0a8ae4342 , Show latest

--- a/avilib/avidump.c
+++ b/avilib/avidump.c
@@ -573,7 +573,7 @@ static boolean ProcessChunk(int fd, off_
     /* Feel free to put your extensions here! */
 
     case avihtag:
-	dump_vals(fd,sizeof(names_avih)/sizeof(struct VAL),names_avih);
+	dump_vals(fd,sizeof(names_avih)/sizeof(names_avih[0]),names_avih);
 	break;
     case strhtag:
     {
@@ -581,17 +581,17 @@ static boolean ProcessChunk(int fd, off_
 	xio_read(fd, &fcc_type,sizeof(FOURCC));
 	FOURCC2Str(fcc_type,typestr);
 	printf("\tfcc_type     = %s\n",typestr);
-	dump_vals(fd,sizeof(names_strh)/sizeof(struct VAL),names_strh);
+	dump_vals(fd,sizeof(names_strh)/sizeof(names_strh[0]),names_strh);
 	break;
     }
     case strftag:
 
 	switch (fcc_type) {
 	case vidstag:
-	    dump_vals(fd,sizeof(names_strf_vids)/sizeof(struct VAL),names_strf_vids);
+	    dump_vals(fd,sizeof(names_strf_vids)/sizeof(names_strf_vids[0]),names_strf_vids);
 	    break;
 	case audstag:
-	    dump_vals(fd,sizeof(names_strf_auds)/sizeof(char*),names_strf_auds);
+	    dump_vals(fd,sizeof(names_strf_auds)/sizeof(names_strf_auds[0]),names_strf_auds);
 	    break;
 	default:
 	    printf("unknown\n");
@@ -600,16 +600,16 @@ static boolean ProcessChunk(int fd, off_
 	break;
 
     case Tagwave:
-	dump_vals(fd,sizeof(names_strf_auds)/sizeof(char*),names_strf_auds);
+	dump_vals(fd,sizeof(names_strf_auds)/sizeof(names_strf_auds[0]),names_strf_auds);
 	break;
 
     case indxtag: {
-	uint32_t chunks=*chunksize-sizeof(names_indx)/sizeof(char*);
+	uint32_t chunks=*chunksize-sizeof(names_indx)/sizeof(names_indx[0]);
 	loff_t offset;
 	uint32_t size, duration;
 	uint32_t u=0;
 	off_t indxend = datapos + chunks;
-	dump_vals(fd,sizeof(names_indx)/sizeof(char*),names_indx);
+	dump_vals(fd,sizeof(names_indx)/sizeof(names_indx[0]),names_indx);
 
 	while (datapos < indxend) {
 	    xio_read(fd, &offset,8);
@@ -629,11 +629,11 @@ static boolean ProcessChunk(int fd, off_
     case Tagix01:
     case Tagix02:
     case Tagix03: {
-	uint32_t chunks=*chunksize-sizeof(names_stdidx)/sizeof(char*);
+	uint32_t chunks=*chunksize-sizeof(names_stdidx)/sizeof(names_stdidx[0]);
 	uint32_t offset, size, key;
 	uint32_t u=0;
 	off_t indxend = datapos + chunks;
-	dump_vals(fd,sizeof(names_stdidx)/sizeof(char*),names_stdidx);
+	dump_vals(fd,sizeof(names_stdidx)/sizeof(names_stdidx[0]),names_stdidx);
 
 	while (datapos < indxend) {
 	    xio_read(fd, &offset,4);
@@ -696,7 +696,7 @@ static boolean ProcessChunk(int fd, off_
 	break;
 
     case dmlhtag:
-	dump_vals(fd,sizeof(names_dmlh)/sizeof(struct VAL),names_dmlh);
+	dump_vals(fd,sizeof(names_dmlh)/sizeof(names_dmlh[0]),names_dmlh);
 	break;
     }
 
--- a/avilib/avilib.c
+++ b/avilib/avilib.c
@@ -184,7 +184,7 @@ static int avi_ixnn_entry(avi_t *AVI, av
 {
     int bl, k;
     unsigned int max = ch->nEntriesInUse * sizeof(uint32_t) * ch->wLongsPerEntry + 24; // header
-    char *ix00 = plat_malloc(max);
+    unsigned char *ix00 = plat_malloc(max);
     char dfcc[5];
     memcpy(dfcc, ch->fcc, 4);
     dfcc[4] = 0;
--- a/avilib/avilib.h
+++ b/avilib/avilib.h
@@ -92,7 +92,7 @@ typedef struct _avistdindex_entry {
 
 // Standard index
 typedef struct _avistdindex_chunk {
-    char           fcc[4];                 // ix##
+    unsigned char           fcc[4];                 // ix##
     uint32_t  dwSize;                 // size of this chunk
     uint16_t wLongsPerEntry;         // must be sizeof(aIndex[0])/sizeof(DWORD)
     uint8_t  bIndexSubType;          // must be 0
@@ -107,7 +107,7 @@ typedef struct _avistdindex_chunk {
 
 // Base Index Form 'indx'
 typedef struct _avisuperindex_chunk {
-    char           fcc[4];
+    unsigned char           fcc[4];
     uint32_t  dwSize;                 // size of this chunk
     uint16_t wLongsPerEntry;         // size of each entry in aIndex array (must be 8 for us)
     uint8_t  bIndexSubType;          // future use. must be 0
--- a/export/aud_aux.c
+++ b/export/aud_aux.c
@@ -843,7 +843,7 @@ static int tc_audio_encode_mp3(char *aud
 
 static int tc_audio_encode_ffmpeg(char *aud_buffer, int aud_size, avi_t *avifile)
 {
-#ifdef HAVE_FFMPEG
+#if 0 //def HAVE_FFMPEG
     int  in_size, out_size;
     char *in_buf;
 
--- a/import/extract_ogm.c
+++ b/import/extract_ogm.c
@@ -66,7 +66,10 @@ typedef struct stream_t {
 
 stream_t *first;
 int      nastreams = 0, nvstreams = 0, ntstreams = 0, numstreams = 0;
-char basename[] = "stdout";
+
+#undef basename
+#define basename my_stdout
+static char basename[] = "stdout";
 
 static void add_stream(stream_t *ndmx) {
   stream_t *cur = first;
--- a/import/mpg123.h
+++ b/import/mpg123.h
@@ -36,6 +36,41 @@
 #include <lame.h>
 #endif
 
+#if DEPRECATED_OR_OBSOLETE_CODE_REMOVED
+int CDECL lame_decode_init(void);
+int CDECL lame_decode(
+        unsigned char *  mp3buf,
+        int              len,
+        short            pcm_l[],
+        short            pcm_r[] );
+int CDECL lame_decode_headers(
+        unsigned char*   mp3buf,
+        int              len,
+        short            pcm_l[],
+        short            pcm_r[],
+        mp3data_struct*  mp3data );
+int CDECL lame_decode1(
+        unsigned char*  mp3buf,
+        int             len,
+        short           pcm_l[],
+        short           pcm_r[] );
+int CDECL lame_decode1_headers(
+        unsigned char*   mp3buf,
+        int              len,
+        short            pcm_l[],
+        short            pcm_r[],
+        mp3data_struct*  mp3data );
+int CDECL lame_decode1_headersB(
+        unsigned char*   mp3buf,
+        int              len,
+        short            pcm_l[],
+        short            pcm_r[],
+        mp3data_struct*  mp3data,
+        int              *enc_delay,
+        int              *enc_padding );
+int CDECL lame_decode_exit(void);
+#endif /* obsolete lame_decode API calls */
+
 int lame_decode_initfile(FILE * fd, mp3data_struct * mp3data, int format);
 int lame_decode_fromfile(FILE * fd, short pcm_l[], short pcm_r[], mp3data_struct * mp3data);
 
--- a/import/v4l/import_v4l2.c
+++ b/import/v4l/import_v4l2.c
@@ -454,8 +454,7 @@ static int tc_v4l2_video_setup_cropping(
     if (ret < 0) {
         tc_log_warn(MOD_NAME,
                     "driver does not support cropping"
-                    "(ioctl(VIDIOC_CROPCAP) returns \"%s\"), disabled",
-                    errno <= sys_nerr ? sys_errlist[errno] : "unknown");
+                    "(ioctl(VIDIOC_CROPCAP) returns \"%m\"), disabled");
         return TC_ERROR;
     }
     if (verbose_flag > TC_INFO) {
@@ -484,8 +483,7 @@ static int tc_v4l2_video_setup_cropping(
     if (ret < 0) {
         tc_log_warn(MOD_NAME,
                     "driver does not support inquiring cropping"
-                    " parameters (ioctl(VIDIOC_G_CROP) returns \"%s\")",
-                    errno <= sys_nerr ? sys_errlist[errno] : "unknown");
+                    " parameters (ioctl(VIDIOC_G_CROP) returns \"%m\")");
         return -1;
     }
 
@@ -512,8 +510,7 @@ static int tc_v4l2_video_setup_cropping(
         if (ret < 0) {
             tc_log_warn(MOD_NAME,
                         "driver does not support inquering cropping"
-                        " parameters (ioctl(VIDIOC_G_CROP) returns \"%s\")",
-                        errno <= sys_nerr ? sys_errlist[errno] : "unknown");
+                        " parameters (ioctl(VIDIOC_G_CROP) returns \"%m\")");
             return -1;
         }
         if (verbose_flag > TC_INFO) {
@@ -612,8 +609,7 @@ static int tc_v4l2_video_setup_stream_pa
     err = ioctl(vs->video_fd, VIDIOC_S_PARM, &streamparm);
     if (err < 0) {
         if (verbose_flag) {
-            tc_log_warn(MOD_NAME, "driver does not support setting parameters (ioctl(VIDIOC_S_PARM) returns \"%s\")",
-                        errno <= sys_nerr ? sys_errlist[errno] : "unknown");
+            tc_log_warn(MOD_NAME, "driver does not support setting parameters (ioctl(VIDIOC_S_PARM) returns \"%m\")");
         }
     }
     return TC_OK;
@@ -627,8 +623,7 @@ static int tc_v4l2_video_get_TV_standard
 
     err = ioctl(vs->video_fd, VIDIOC_G_STD, &stdid);
     if (err < 0) {
-        tc_log_warn(MOD_NAME, "driver does not support get std (ioctl(VIDIOC_G_STD) returns \"%s\")",
-                    errno <= sys_nerr ? sys_errlist[errno] : "unknown");
+        tc_log_warn(MOD_NAME, "driver does not support get std (ioctl(VIDIOC_G_STD) returns \"%m\")");
         memset(&stdid, 0, sizeof(v4l2_std_id));
     }
 
--- a/import/v4l/import_v4lcam.c
+++ b/import/v4l/import_v4lcam.c
@@ -367,8 +367,7 @@ static int tc_v4l2_video_setup_stream_pa
     err = v4l2_ioctl(vs->video_fd, VIDIOC_S_PARM, &streamparm);
     if (err < 0) {
         tc_log_warn(MOD_NAME, "driver does not support setting parameters"
-                              " (ioctl(VIDIOC_S_PARM) returns \"%s\")",
-                    errno <= sys_nerr ? sys_errlist[errno] : "unknown");
+                              " (ioctl(VIDIOC_S_PARM) returns \"%m\")");
     }
     return TC_OK;
 }
--- a/src/framebuffer.c
+++ b/src/framebuffer.c
@@ -1101,7 +1101,7 @@ vframe_list_t *vframe_reserve(void)
 } while (0)
 
 
-void aframe_push_next(aframe_list_t *ptr, int status)
+void aframe_push_next(aframe_list_t *ptr, TCFrameStatus status)
 {
     if (ptr == NULL) {
         /* a bit more of paranoia */
@@ -1123,7 +1123,7 @@ void aframe_push_next(aframe_list_t *ptr
 }
 
 
-void vframe_push_next(vframe_list_t *ptr, int status)
+void vframe_push_next(vframe_list_t *ptr, TCFrameStatus status)
 {
     if (ptr == NULL) {
         /* a bit more of paranoia */