Switch to FFMPEG v2


(adam)

$NetBSD: patch-avilib_avidump.c,v 1.1 2015/11/21 17:14:26 adam Exp $

Compatibility fix.

--- avilib/avidump.c.orig	2012-02-01 17:07:24.000000000 +0000
+++ avilib/avidump.c
@@ -320,7 +320,7 @@ static void dump_vals(int fd, int count,
 {
     uint32_t i,j,val32;
     uint16_t val16;
-    loff_t val64;
+    uint64_t val64;
     char val8;
 
     for (i = 0; names[i].type != EoLST; i++) {
@@ -605,7 +605,7 @@ static boolean ProcessChunk(int fd, off_
 
     case indxtag: {
 	uint32_t chunks=*chunksize-sizeof(names_indx)/sizeof(char*);
-	loff_t offset;
+	uint64_t offset;
 	uint32_t size, duration;
 	uint32_t u=0;
 	off_t indxend = datapos + chunks;

$NetBSD: patch-configure,v 1.1 2015/11/21 17:14:26 adam Exp $

Add DragonFly support.
Make use of PTHREAD_LDFLAGS.
Portability fix.

--- configure.orig	2011-11-19 16:50:37.000000000 +0000
+++ configure
@@ -5096,7 +5096,7 @@ case "${target_os}" in
 $as_echo "#define OS_LINUX 1" >>confdefs.h
 
     ;;
-  freebsd*|openbsd*|netbsd*|bsdi*|darwin*|rhapsody*)
+  freebsd*|openbsd*|netbsd*|bsdi*|darwin*|rhapsody*|dragonfly*)
     is_bsd=yes
 
 $as_echo "#define OS_BSD 1" >>confdefs.h
@@ -19431,7 +19431,7 @@ case "$host" in
 esac
 # let user override
 if test -n "$PTHREAD_LIBS" ; then
-  pthread_libs="$PTHREAD_LIBS"
+  pthread_libs="$PTHREAD_LIBS $PTHREAD_LDFLAGS"
 fi
 if test -n "$PTHREAD_CFLAGS" ; then
   pthread_cflags="$PTHREAD_CFLAGS"
@@ -29507,7 +29507,7 @@ if test "${enable_nuv+set}" = set; then 
     yes) if test yes != "$have_lzo"; then
            as_fn_error $? "liblzo2 is required for NuppelVideo support, try --enable-lzo" "$LINENO" 5
          fi
-    	 if test true == "$have_x86_64cpu"; then
+    	 if test true = "$have_x86_64cpu"; then
            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: NuppelVideo support on x86_64 platform is ***EXPERIMENTAL***" >&5
 $as_echo "$as_me: WARNING: NuppelVideo support on x86_64 platform is ***EXPERIMENTAL***" >&2;}
          elif test true != "$have_x86cpu"; then

$NetBSD: patch-export_aud__aux.c,v 1.1 2015/11/21 17:14:26 adam Exp $

Fixes building against FFmpeg version >= 2.0.0 (gentoo patch).

--- export/aud_aux.c.orig	2011-11-19 16:50:27.000000000 +0000
+++ export/aud_aux.c
@@ -346,7 +346,7 @@ static int tc_audio_init_ffmpeg(vob_t *v
 
     //-- set parameters (bitrate, channels and sample-rate) --
     //--------------------------------------------------------
-    avcodec_get_context_defaults(&mpa_ctx);
+    avcodec_get_context_defaults3(&mpa_ctx, mpa_codec);
 #if LIBAVCODEC_VERSION_MAJOR < 53
     mpa_ctx.codec_type  = CODEC_TYPE_AUDIO;
 #else
@@ -359,7 +359,7 @@ static int tc_audio_init_ffmpeg(vob_t *v
     //-- open codec --
     //----------------
     TC_LOCK_LIBAVCODEC;
-    ret = avcodec_open(&mpa_ctx, mpa_codec);
+    ret = avcodec_open2(&mpa_ctx, mpa_codec, NULL);
     TC_UNLOCK_LIBAVCODEC;
     if (ret < 0) {
         tc_warn("tc_audio_init_ffmpeg: could not open %s codec !",

$NetBSD: patch-export_ffmpeg_cfg.h,v 1.1 2015/11/21 17:14:26 adam Exp $

Fixes building against FFmpeg version >= 2.0.0 (gentoo patch).

--- export/ffmpeg_cfg.h.orig	2011-11-19 16:50:27.000000000 +0000
+++ export/ffmpeg_cfg.h
@@ -13,8 +13,6 @@ extern int lavc_param_vme;
 //extern int lavc_param_vqscale;
 //extern int lavc_param_vqmin;
 //extern int lavc_param_vqmax;
-extern int lavc_param_mb_qmin;
-extern int lavc_param_mb_qmax;
 extern int lavc_param_lmin;
 extern int lavc_param_lmax;
 extern int lavc_param_vqdiff;

$NetBSD: patch-filter_filter__pp.c,v 1.1 2015/11/21 17:14:26 adam Exp $

Fixes building against FFmpeg version >= 2.0.0 (gentoo patch).

--- filter/filter_pp.c.orig	2011-11-19 16:50:27.000000000 +0000
+++ filter/filter_pp.c
@@ -38,8 +38,8 @@
 
 /* FIXME: these use the filter ID as an index--the ID can grow
  * arbitrarily large, so this needs to be fixed */
-static pp_mode_t *mode[100];
-static pp_context_t *context[100];
+static pp_mode *mode[100];
+static pp_context *context[100];
 static int width[100], height[100];
 static int pre[100];
 

$NetBSD: patch-import_nuv_import__nuv.c,v 1.1 2015/11/21 17:14:26 adam Exp $

Optionally build LZO support.

--- import/nuv/import_nuv.c.orig	2009-02-21 22:01:57.000000000 +0100
+++ import/nuv/import_nuv.c
@@ -15,7 +15,9 @@
 #include "aclib/ac.h"
 #include "nuppelvideo.h"
 #include "RTjpegN.h"
+#ifdef HAVE_LZO
 #include "libtc/tc_lzo.h"
+#endif
 
 #define MOD_NAME        "import_nuv.so"
 #define MOD_VERSION     "v0.9 (2006-06-03)"
@@ -467,6 +469,7 @@ static int nuv_decode_video(TCModuleInst
     in_framesize = inframe->video_size-5-sizeof(pd->cdata);
     out_framesize = pd->width*pd->height + (pd->width/2)*(pd->height/2)*2;
 
+#ifdef HAVE_LZO
     if (comptype == '2' || comptype == '3') {
         /* Undo LZO compression */
         uint8_t *decompressed_frame;
@@ -489,6 +492,7 @@ static int nuv_decode_video(TCModuleInst
         /* Convert 2 -> 1, 3 -> 0 */
         comptype ^= 3;
     }
+#endif
 
     switch (comptype) {