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

[Rich Felker]

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;

int must_prefetch = fps || buff;

> -    if ( (ssrc) && (fps != NULL) ) {
> +    if ( ((ssrc) && (must_prefetch)) ) {

if (ssrc && must_prefetch)

Or just remove the nonsense boolean variable (a value which is only
used once does not really merit a name) and use:

if (ssrc && (fps || buff))

> -        if (!force_fps) {
> +        if ( ((!force_fps) && (fps != NULL)) ) {

if (!force_fps && fps)

Who wrote the ugliness in this patch!? Worst C style I've seen in a
loooong time..

Rich