[PATCH] xdtv: fix compilation with current FFmpeg (was Re: multimedia stack update)

[Dominik 'Rathann' Mierzejewski]

Hi,
it seems I'm not in the ACLs for xdtv. Nicholas, will you please commit
the attached patch?

Regards,
Dominik

-- 
Fedora http://fedoraproject.org/wiki/User:Rathann
RPMFusion http://rpmfusion.org | MPlayer http://mplayerhq.hu
"Faith manages."
        -- Delenn to Lennier in Babylon 5:"Confessions and Lamentations"
-------------- next part --------------
Index: xdtv-2.4.1cvs15-noldffmpeg.patch
===================================================================
RCS file: /cvs/free/rpms/xdtv/F-14/xdtv-2.4.1cvs15-noldffmpeg.patch,v
retrieving revision 1.1
diff -u -r1.1 xdtv-2.4.1cvs15-noldffmpeg.patch
--- xdtv-2.4.1cvs15-noldffmpeg.patch	13 May 2009 11:14:39 -0000	1.1
+++ xdtv-2.4.1cvs15-noldffmpeg.patch	14 Aug 2011 11:52:31 -0000
@@ -1,6 +1,27 @@
+diff -up xdtv-2.4.1cvs15/configure.in.noldffmpeg xdtv-2.4.1cvs15/configure.in
+--- xdtv-2.4.1cvs15/configure.in.noldffmpeg	2009-03-21 12:53:15.000000000 +0100
++++ xdtv-2.4.1cvs15/configure.in	2011-08-14 12:34:41.000000000 +0200
+@@ -1249,7 +1249,7 @@ AH_TEMPLATE(HAVE_SWSCALE, [Define to 1 i
+ if test "x$enable_ffmpeg" != "xno"; then
+   if test "x$with_external_ffmpeg" = "xyes"; then
+ 
+-     PKG_CHECK_MODULES([FFMPEG], [libavcodec libavformat], enable_ffmpeg=yes, enable_ffmpeg=no)
++     PKG_CHECK_MODULES([FFMPEG], [libavcodec libavformat libavutil], enable_ffmpeg=yes, enable_ffmpeg=no)
+      AC_CHECK_HEADERS(ffmpeg/avcodec.h libavcodec/avcodec.h)
+      AC_CHECK_HEADERS(ffmpeg/avformat.h libavformat/avformat.h)
+      AC_CHECK_HEADERS(ffmpeg/avutil.h libavutil/avutil.h)
+@@ -1461,7 +1437,7 @@ if test "x$enable_ffmpeg" != "xno"; then
+ 
+ 		    if test x"$enable_ffmpeg_swscale" == xyes; then
+ 			    AC_DEFINE(HAVE_SWSCALE)
+-			    PKG_CHECK_MODULES([FFMPEG_SWSCALE], [libavcodec libavformat libswscale])
++			    PKG_CHECK_MODULES([FFMPEG_SWSCALE], [libavcodec libavformat libavutil libswscale])
+ 		    fi
+ 
+ 
 diff -up xdtv-2.4.1cvs15/src/container-ffmpeg.c.noldffmpeg xdtv-2.4.1cvs15/src/container-ffmpeg.c
---- xdtv-2.4.1cvs15/src/container-ffmpeg.c.noldffmpeg	2009-04-06 21:22:44.000000000 +0200
-+++ xdtv-2.4.1cvs15/src/container-ffmpeg.c	2009-04-06 21:25:15.000000000 +0200
+--- xdtv-2.4.1cvs15/src/container-ffmpeg.c.noldffmpeg	2011-08-14 12:13:59.000000000 +0200
++++ xdtv-2.4.1cvs15/src/container-ffmpeg.c	2011-08-14 12:13:59.000000000 +0200
 @@ -23,16 +23,8 @@
  
  #ifdef HAVE_FFMPEG
@@ -19,8 +40,8 @@
  static AVOutputFormat *av_output_fmt = NULL;
  static AVFormatContext *oc=NULL; 
 diff -up xdtv-2.4.1cvs15/src/container.h.noldffmpeg xdtv-2.4.1cvs15/src/container.h
---- xdtv-2.4.1cvs15/src/container.h.noldffmpeg	2009-04-06 21:20:21.000000000 +0200
-+++ xdtv-2.4.1cvs15/src/container.h	2009-04-06 21:20:30.000000000 +0200
+--- xdtv-2.4.1cvs15/src/container.h.noldffmpeg	2011-08-14 12:13:59.000000000 +0200
++++ xdtv-2.4.1cvs15/src/container.h	2011-08-14 12:13:59.000000000 +0200
 @@ -14,11 +14,7 @@
  #include "strtab.h"
  
@@ -34,8 +55,8 @@
  
  enum {
 diff -up xdtv-2.4.1cvs15/src/divx.h.noldffmpeg xdtv-2.4.1cvs15/src/divx.h
---- xdtv-2.4.1cvs15/src/divx.h.noldffmpeg	2009-04-06 21:21:07.000000000 +0200
-+++ xdtv-2.4.1cvs15/src/divx.h	2009-04-06 21:21:28.000000000 +0200
+--- xdtv-2.4.1cvs15/src/divx.h.noldffmpeg	2011-08-14 12:13:59.000000000 +0200
++++ xdtv-2.4.1cvs15/src/divx.h	2011-08-14 12:13:59.000000000 +0200
 @@ -31,17 +31,9 @@
  #include "container.h"
  
@@ -55,8 +76,8 @@
  #endif
  
 diff -up xdtv-2.4.1cvs15/src/grab-dvb.c.noldffmpeg xdtv-2.4.1cvs15/src/grab-dvb.c
---- xdtv-2.4.1cvs15/src/grab-dvb.c.noldffmpeg	2009-04-06 21:25:47.000000000 +0200
-+++ xdtv-2.4.1cvs15/src/grab-dvb.c	2009-04-06 21:27:11.000000000 +0200
+--- xdtv-2.4.1cvs15/src/grab-dvb.c.noldffmpeg	2011-08-14 12:13:59.000000000 +0200
++++ xdtv-2.4.1cvs15/src/grab-dvb.c	2011-08-14 12:13:59.000000000 +0200
 @@ -44,29 +44,12 @@
  #include "dvbtools.h"
  #include "avilib.h"
Index: xdtv.spec
===================================================================
RCS file: /cvs/free/rpms/xdtv/F-14/xdtv.spec,v
retrieving revision 1.2
diff -u -r1.2 xdtv.spec
--- xdtv.spec	16 Oct 2009 22:03:20 -0000	1.2
+++ xdtv.spec	14 Aug 2011 11:52:31 -0000
@@ -2,7 +2,7 @@
 
 Name:           xdtv
 Version:        2.4.1
-Release:        0.6%{?cvs}%{?dist}
+Release:        0.7%{?cvs}%{?dist}
 Summary:        Video4Linux Stream Capture Viewer & Recorder
 
 Group:          Applications/Multimedia
@@ -269,6 +269,9 @@
 
 
 %changelog
+* Sun Aug 14 2011 Dominik Mierzejewski <rpm at greysector.net> - 2.4.1-0.7cvs15
+- Fix build with current FFmpeg
+
 * Wed Apr  8 2009 kwizart < kwizart at gmail.com > - 2.4.1-0.6cvs15
 - Rebuild for F-12
 - Conditionalize faac