From nobody@FreeBSD.org  Tue May  1 13:44:29 2012
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 3AB8710656EF
	for <freebsd-gnats-submit@FreeBSD.org>; Tue,  1 May 2012 13:44:29 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from red.freebsd.org (red.freebsd.org [IPv6:2001:4f8:fff6::22])
	by mx1.freebsd.org (Postfix) with ESMTP id 25D568FC0A
	for <freebsd-gnats-submit@FreeBSD.org>; Tue,  1 May 2012 13:44:29 +0000 (UTC)
Received: from red.freebsd.org (localhost [127.0.0.1])
	by red.freebsd.org (8.14.4/8.14.4) with ESMTP id q41DiSJ7088415
	for <freebsd-gnats-submit@FreeBSD.org>; Tue, 1 May 2012 13:44:28 GMT
	(envelope-from nobody@red.freebsd.org)
Received: (from nobody@localhost)
	by red.freebsd.org (8.14.4/8.14.4/Submit) id q41DiS8U088388;
	Tue, 1 May 2012 13:44:28 GMT
	(envelope-from nobody)
Message-Id: <201205011344.q41DiS8U088388@red.freebsd.org>
Date: Tue, 1 May 2012 13:44:28 GMT
From: Thomas Zander <thomas.e.zander@googlemail.com>
To: freebsd-gnats-submit@FreeBSD.org
Subject: Fix h264 regression in mplayer/mencoder from ffmpeg
X-Send-Pr-Version: www-3.1
X-GNATS-Notify:

>Number:         167485
>Category:       ports
>Synopsis:       multimedia/mplayer: Fix h264 regression in mplayer/mencoder from ffmpeg
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    scheidell
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Tue May 01 13:50:10 UTC 2012
>Closed-Date:    Thu May 03 00:13:28 UTC 2012
>Last-Modified:  Thu May  3 00:20:05 UTC 2012
>Originator:     Thomas Zander
>Release:        
>Organization:
>Environment:
>Description:
The ffmpeg snapshot in the current mplayer port exhibits a rare a/v sync problem.
>How-To-Repeat:

>Fix:
Attached patch introduces files/patch-libavcodec-mpegaudio_parser.c from ffmpeg that solves the problem.
I have not bumped PORTREVISION because the issue does not hit the majority of users, but if the committer feels this would be better, feel free to bump PORTREVISION on both mplayer and mencoder.

Patch attached with submission follows:

diff -r 79e69fb2f2ad mplayer/files/patch-libavcodec-mpegaudio_parser.c
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/mplayer/files/patch-libavcodec-mpegaudio_parser.c	Tue May 01 15:36:35 2012 +0200
@@ -0,0 +1,11 @@
+--- ffmpeg/libavcodec/mpegaudio_parser.c.orig	2012-03-04 19:20:05.000000000 +0100
++++ ffmpeg/libavcodec/mpegaudio_parser.c	2012-05-01 14:57:54.645626270 +0200
+@@ -78,7 +78,7 @@
+                     if (s->header_count > 1) {
+                         avctx->sample_rate= sr;
+                         avctx->channels   = channels;
+-                        s1->duration      = frame_size;
++                        avctx->frame_size = frame_size;
+                         avctx->bit_rate   = bit_rate;
+                     }
+                     break;


>Release-Note:
>Audit-Trail:

From: Thomas Zander <thomas.e.zander@googlemail.com>
To: FreeBSD-gnats-submit@freebsd.org
Cc:  
Subject: Re: ports/167485: Fix h264 regression in mplayer/mencoder from ffmpeg
Date: Tue, 1 May 2012 15:55:20 +0200

 Additional note:
 
 Thanks to Stefan Ehmann <shoesoft@gmx.net> for discovering this
 problem and suggesting the patch!
Responsible-Changed-From-To: freebsd-ports-bugs->scheidell 
Responsible-Changed-By: scheidell 
Responsible-Changed-When: Tue May 1 19:32:09 UTC 2012 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=167485 
State-Changed-From-To: open->feedback 
State-Changed-By: scheidell 
State-Changed-When: Tue May 1 19:38:46 UTC 2012 
State-Changed-Why:  
Do you want this patch in both mplayer and mencoder? (yes, we change 
package, we bump PORTREVISION.  Big discussion in ports@ a couple weeks 
ago, see 'PORTREVISIN BUMP FAQ') 

http://www.freebsd.org/cgi/query-pr.cgi?pr=167485 
State-Changed-From-To: feedback->closed 
State-Changed-By: scheidell 
State-Changed-When: Thu May 3 00:13:26 UTC 2012 
State-Changed-Why:  
Committed. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=167485 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/167485: commit references a PR
Date: Thu,  3 May 2012 00:13:30 +0000 (UTC)

 scheidell    2012-05-03 00:13:16 UTC
 
   FreeBSD ports repository
 
   Modified files:
     multimedia/mencoder  Makefile 
     multimedia/mplayer   Makefile 
   Added files:
     multimedia/mplayer/files patch-libavcodec-mpegaudio_parser.c 
   Log:
   - Fix h264 regression in mplayer/mencoder from ffmpeg
   - Bump PORTREVISION on master and slave to force rebuild
   
   PR:             ports/167485
   Submitted by:   Thomas Zander <thomas.e.zander@googlemail.com> (maintainer)
   
   Revision  Changes    Path
   1.39      +1 -0      ports/multimedia/mencoder/Makefile
   1.217     +1 -0      ports/multimedia/mplayer/Makefile
   1.1       +11 -0     ports/multimedia/mplayer/files/patch-libavcodec-mpegaudio_parser.c (new)
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
>Unformatted:
