Packman Build Service PMBS

File transcode.patch of Package transcode (Revision 27)

Currently displaying revision 27 , Show latest

--- 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;
 }