File transcode-ffmpeg.diff of Package transcode

File transcode-ffmpeg.diff of Package transcode (Revision 10)

Currently displaying revision 10 , Show latest

diff -ur transcode-1.1.5.orig/export/aud_aux.c transcode-1.1.5/export/aud_aux.c
--- transcode-1.1.5.orig/export/aud_aux.c	2009-07-18 13:56:04.000000000 +0200
+++ transcode-1.1.5/export/aud_aux.c	2013-08-01 20:10:36.917726994 +0200
@@ -46,6 +46,8 @@
 
 #ifdef HAVE_FFMPEG
 #include "libtc/tcavcodec.h"
+#include "libavcodec/avcodec.h"
+#include "libavutil/mathematics.h"
 
 
 static AVCodec        *mpa_codec = NULL;
@@ -346,7 +348,8 @@
 
     //-- set parameters (bitrate, channels and sample-rate) --
     //--------------------------------------------------------
-    memset(&mpa_ctx, 0, sizeof(mpa_ctx));          // default all
+    //memset(&mpa_ctx, 0, sizeof(mpa_ctx));          // default all
+    avcodec_get_context_defaults(&mpa_ctx); // default all
     mpa_ctx.bit_rate    = vob->mp3bitrate * 1000;  // bitrate dest.
     mpa_ctx.channels    = vob->dm_chan;            // channels
     mpa_ctx.sample_rate = vob->a_rate;
diff -ur transcode-1.1.5.orig/export/export_ffmpeg.c transcode-1.1.5/export/export_ffmpeg.c
--- transcode-1.1.5.orig/export/export_ffmpeg.c	2009-02-21 22:01:57.000000000 +0100
+++ transcode-1.1.5/export/export_ffmpeg.c	2013-08-01 20:11:47.596879027 +0200
@@ -668,7 +668,7 @@
     lavc_venc_context->rc_qsquish         = lavc_param_rc_qsquish;
     lavc_venc_context->rc_qmod_amp        = lavc_param_rc_qmod_amp;
     lavc_venc_context->rc_qmod_freq       = lavc_param_rc_qmod_freq;
-    lavc_venc_context->rc_eq              = lavc_param_rc_eq;
+    lavc_venc_context->rc_eq              = av_strdup(lavc_param_rc_eq);
     lavc_venc_context->rc_max_rate        = lavc_param_rc_max_rate * 1000;
     lavc_venc_context->rc_min_rate        = lavc_param_rc_min_rate * 1000;
     lavc_venc_context->rc_buffer_size     = lavc_param_rc_buffer_size * 1024;
diff -ur transcode-1.1.5.orig/import/Makefile.am transcode-1.1.5/import/Makefile.am
--- transcode-1.1.5.orig/import/Makefile.am	2009-10-31 18:02:08.000000000 +0100
+++ transcode-1.1.5/import/Makefile.am	2013-08-01 20:10:36.917726994 +0200
@@ -143,9 +143,9 @@
 import_dvd_la_LIBADD = $(LIBDVDREAD_LIBS)
 
 import_ffmpeg_la_SOURCES = import_ffmpeg.c
-import_ffmpeg_la_CPPFLAGS = $(AM_CPPFLAGS) $(LIBAVFORMAT_CFLAGS)
+import_ffmpeg_la_CPPFLAGS = $(AM_CPPFLAGS) $(LIBAVFORMAT_CFLAGS) $(LIBAVCODEC_CFLAGS)
 import_ffmpeg_la_LDFLAGS = -module -avoid-version
-import_ffmpeg_la_LIBADD = $(LIBAVFORMAT_LIBS)
+import_ffmpeg_la_LIBADD = $(LIBAVFORMAT_LIBS) $(LIBAVCODEC_LIBS)
 
 import_im_la_SOURCES = import_im.c
 import_im_la_CPPFLAGS = $(AM_CPPFLAGS) $(IMAGEMAGICK_CFLAGS)
diff -ur transcode-1.1.5.orig/import/Makefile.in transcode-1.1.5/import/Makefile.in
--- transcode-1.1.5.orig/import/Makefile.in	2009-10-31 18:41:01.000000000 +0100
+++ transcode-1.1.5/import/Makefile.in	2013-08-01 20:10:36.920726914 +0200
@@ -753,9 +753,9 @@
 import_dvd_la_LDFLAGS = -module -avoid-version
 import_dvd_la_LIBADD = $(LIBDVDREAD_LIBS)
 import_ffmpeg_la_SOURCES = import_ffmpeg.c
-import_ffmpeg_la_CPPFLAGS = $(AM_CPPFLAGS) $(LIBAVFORMAT_CFLAGS)
+import_ffmpeg_la_CPPFLAGS = $(AM_CPPFLAGS) $(LIBAVFORMAT_CFLAGS) $(LIBAVCODEC_CFLAGS)
 import_ffmpeg_la_LDFLAGS = -module -avoid-version
-import_ffmpeg_la_LIBADD = $(LIBAVFORMAT_LIBS)
+import_ffmpeg_la_LIBADD = $(LIBAVFORMAT_LIBS) $(LIBAVCODEC_LIBS)
 import_im_la_SOURCES = import_im.c
 import_im_la_CPPFLAGS = $(AM_CPPFLAGS) $(IMAGEMAGICK_CFLAGS)
 import_im_la_LDFLAGS = -module -avoid-version