File transcode-fix-64bit-portability.patch of Package transcode

File transcode-fix-64bit-portability.patch of Package transcode (Revision ca103485409ede9b64d2052463e4ae01)

Currently displaying revision ca103485409ede9b64d2052463e4ae01 , Show latest

Index: export/export_ffmpeg.c
===================================================================
--- export/export_ffmpeg.c.orig
+++ export/export_ffmpeg.c
@@ -181,10 +181,11 @@ static char *tc_strchrnul(const char *s,
 
 
 /* START: COPIED FROM ffmpeg-0.5_p22846(ffmpeg.c, cmdutils.c) */
-#include <libavutil/opt.h>
-#include <libavutil/avstring.h>
-#include <libswscale/swscale.h>
-
+#include <ffmpeg/libavutil/opt.h>
+#include <ffmpeg/libavutil/avstring.h>
+#include <ffmpeg/libswscale/swscale.h>
+#include <ffmpeg/libavcodec/avcodec.h>
+#include <ffmpeg/libavutil/eval.h>
 /* GLUE: */
 #define FFMPEG_DATADIR lavc_param_ffmpeg_datadir
 
@@ -245,12 +246,13 @@ int opt_default(const char *opt, const c
     int type;
     int ret= 0;
     const AVOption *o= NULL;
-    int opt_types[]={AV_OPT_FLAG_VIDEO_PARAM, AV_OPT_FLAG_AUDIO_PARAM, 0, AV_OPT_FLAG_SUBTITLE_PARAM, 0};
+    const AVOption * 	av_find_opt (void *v, const char *name, const char *unit, int mask, int flags);
+    long opt_types[]={AV_OPT_FLAG_VIDEO_PARAM, AV_OPT_FLAG_AUDIO_PARAM, 0, AV_OPT_FLAG_SUBTITLE_PARAM, 0};
 
     for(type=0; type<AVMEDIA_TYPE_NB && ret>= 0; type++){
 		/* GLUE: +if */
 		if (type == AVMEDIA_TYPE_VIDEO) {
-        const AVOption *o2 = av_find_opt(avcodec_opts[0], opt, NULL, opt_types[type], opt_types[type]);
+        AVOption *o2 = av_find_opt(avcodec_opts[0], opt, NULL, opt_types[type], opt_types[type]);
         if(o2)
             ret = av_set_string3(avcodec_opts[type], opt, arg, 1, &o);
 		/* GLUE: +if */