Re: [MPlayer-cvslog] r25038 - trunk/libmpdemux/demux_nemesi.c

14 Nov 2007

Hello,
On Wed, Nov 14, 2007 at 12:00:12AM +0100, lu_zero wrote:
...
Author: lu_zero
Date: Wed Nov 14 00:00:12 2007
New Revision: 25038
Log:
fetch metadata for audio (from amol)
Modified:
   trunk/libmpdemux/demux_nemesi.c
Modified: trunk/libmpdemux/demux_nemesi.c
==============================================================================

--- trunk/libmpdemux/demux_nemesi.c	(original)
+++ trunk/libmpdemux/demux_nemesi.c	Wed Nov 14 00:00:12 2007
@@ -74,12 +74,13 @@ static void link_session_and_fetch_conf(
     rtp_ssrc *ssrc = NULL;
     rtp_frame * fr = &ndsd->first_pkt[stype];
     rtp_buff trash_buff;
+    int must_prefetch = ((fps != NULL) || (buff != NULL)) ? 1 : 0;
ndsd->session[stype] = sess;
ssrc = wait_for_packets(ndsd, stype);
-    if ( (ssrc) && (fps != NULL) ) {
+    if ( ((ssrc) && (must_prefetch)) ) {
         if (buff == NULL)
             buff = &trash_buff;
@@ -88,7 +89,7 @@ static void link_session_and_fetch_conf(
         /* Packet prefecthing must be done anyway or we won't be
            able to get the metadata, but fps calculation happens
            only if the user didn't specify the FPS */
-        if (!force_fps) {
+        if ( ((!force_fps) && (fps != NULL)) ) {
Would be nice if someone could cut down those excess () a bit, it is
almost painful to my eyes :-)

Greetings,
Reimar Döffinger

    