ports/167485: Fix h264 regression in mplayer/mencoder from ffmpeg

[Thomas Zander]

>Number:         167485
>Category:       ports
>Synopsis:       Fix h264 regression in mplayer/mencoder from ffmpeg
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Tue May 01 13:50:10 UTC 2012
>Closed-Date:
>Last-Modified:
>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:
>Unformatted: