[MPlayer-cvslog] r37966 - trunk/libmpdemux/demux_audio.c

[ib]

Author: ib
Date: Tue Oct  3 16:47:11 2017
New Revision: 37966

Log:
Accept ReplayGain information from arbitrary encoders.

Don't restrict it to the LAME encoder.

Modified:
   trunk/libmpdemux/demux_audio.c

Modified: trunk/libmpdemux/demux_audio.c
==============================================================================
--- trunk/libmpdemux/demux_audio.c	Fri Sep 29 18:50:58 2017	(r37965)
+++ trunk/libmpdemux/demux_audio.c	Tue Oct  3 16:47:11 2017	(r37966)
@@ -320,10 +320,7 @@ static unsigned int mp3_vbr_frames(strea
       if (data & 0x1)                   // frames field is present
         data = stream_read_dword(s);    // frames
 
-      if (stream_skip(s, 108)) {
-        unsigned int dword = stream_read_dword(s);
-
-        if (dword == MKBETAG('L','A','M','E') && stream_skip(s, 11)) {
+      if (stream_skip(s, 123)) {
           uint16_t word = stream_read_word(s);
 
           /* Radio ReplayGain */
@@ -333,7 +330,6 @@ static unsigned int mp3_vbr_frames(strea
             if ((word >> 9) & 1)
               priv->r_gain = -priv->r_gain;
           }
-        }
       }
 
       return data;