From owner-freebsd-multimedia  Tue Feb 11 21:37:57 2003
Delivered-To: freebsd-multimedia@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 7D6CD37B401
	for <freebsd-multimedia@freebsd.org>; Tue, 11 Feb 2003 21:37:55 -0800 (PST)
Received: from mother.ludd.luth.se (mother.ludd.luth.se [130.240.16.3])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 0019E43F93
	for <freebsd-multimedia@freebsd.org>; Tue, 11 Feb 2003 21:36:33 -0800 (PST)
	(envelope-from pb@ludd.luth.se)
Received: from brother.ludd.luth.se (brother.ludd.luth.se [130.240.16.78])
	by mother.ludd.luth.se (8.11.6+Sun/8.9.3) with ESMTP id h1C5aW000796
	for <freebsd-multimedia@freebsd.org>; Wed, 12 Feb 2003 06:36:32 +0100 (MET)
From: Peter B <pb@ludd.luth.se>
Received: (from pb@localhost)
	by brother.ludd.luth.se (8.11.6+Sun/8.9.3) id h1C5aWD24746
	for freebsd-multimedia@freebsd.org; Wed, 12 Feb 2003 06:36:32 +0100 (MET)
Message-Id: <200302120536.h1C5aWD24746@brother.ludd.luth.se>
Subject: ffmpeg patches to enable bt878 tv-capture
To: freebsd-multimedia@freebsd.org
Date: Wed, 12 Feb 2003 06:36:32 +0100 (MET)
X-Mailer: ELM [version 2.4ME+ PL54 (25)]
MIME-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
Sender: owner-freebsd-multimedia@FreeBSD.ORG
Precedence: bulk
List-ID: <freebsd-multimedia.FreeBSD.ORG>
List-Archive: <http://docs.freebsd.org/mail/> (Web Archive)
List-Help: <mailto:majordomo@FreeBSD.ORG?subject=help> (List Instructions)
List-Subscribe: <mailto:majordomo@FreeBSD.ORG?subject=subscribe%20freebsd-multimedia>
List-Unsubscribe: <mailto:majordomo@FreeBSD.ORG?subject=unsubscribe%20freebsd-multimedia>
X-Loop: FreeBSD.org


This patch on the port "multimedia/ffmpeg" in the directory
ffmpeg/work/ffmpeg-0.4.6/libavformat

Fixes: 
  Input mode to PAL.
  Input device to TV.
  Ability to capture from userland.
  Proper handling of open() failures.


*** grab_bsdbktr.c.bak  Wed Feb 12 05:12:29 2003
--- grab_bsdbktr.c      Wed Feb 12 05:42:51 2003
***************
*** 52,62 ****
  #define NTSC_HEIGHT 480
  
  #ifndef VIDEO_FORMAT
! #define VIDEO_FORMAT NTSC
  #endif
  
  #ifndef VIDEO_INPUT
! #define VIDEO_INPUT METEOR_INPUT_DEV0;
  #endif
  
  static UINT8 *video_buf;
--- 52,64 ----
  #define NTSC_HEIGHT 480
  
  #ifndef VIDEO_FORMAT
! //#define VIDEO_FORMAT NTSC
! #define VIDEO_FORMAT PAL
  #endif
  
  #ifndef VIDEO_INPUT
! //#define VIDEO_INPUT METEOR_INPUT_DEV0;
! #define VIDEO_INPUT METEOR_INPUT_DEV1;
  #endif
  
  static UINT8 *video_buf;
***************
*** 87,98 ****
        height = s->height;
        s->last_frame_time = 0;
  
!       s->tuner_fd = open ("/dev/tuner0", O_RDWR);
        if (s->tuner_fd < 0) {
                perror("Warning: Tuner not opened continuing");
        }
  
!       video_fd = open(video_device, O_RDWR);
        if (video_fd < 0) {
                perror(video_device);
                return -EIO;
--- 89,103 ----
        height = s->height;
        s->last_frame_time = 0;
  
! //    s->tuner_fd = open ("/dev/tuner0", O_RDWR);
!       s->tuner_fd = open ("/dev/tuner0", O_RDONLY);
        if (s->tuner_fd < 0) {
                perror("Warning: Tuner not opened continuing");
+               exit(-1);
        }
  
! //    video_fd = open(video_device, O_RDWR);
!       video_fd = open(video_device, O_RDONLY);
        if (video_fd < 0) {
                perror(video_device);
                return -EIO;

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-multimedia" in the body of the message