Mercurial > mplayer.hg

changeset 26376:68302d38e153

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Remove another two useless special-case from flac metadata reading function
author reimar
date Sat, 12 Apr 2008 15:16:37 +0000
parents 4319a0b14666
children e03e2d2204b6
files libmpdemux/demux_audio.c
diffstat 1 files changed, 2 insertions(+), 20 deletions(-) [+]
line wrap: on
line diff
--- a/libmpdemux/demux_audio.c	Sat Apr 12 15:14:02 2008 +0000
+++ b/libmpdemux/demux_audio.c	Sat Apr 12 15:16:37 2008 +0000
@@ -168,26 +168,6 @@
 
     switch (preamble[0] & 0x7F)
     {
-    case FLAC_STREAMINFO:
-    {
-      if (blk_len != FLAC_STREAMINFO_SIZE)
-        return;
-
-      stream_skip (s, FLAC_STREAMINFO_SIZE);
-      break;
-    }
-
-    case FLAC_SEEKTABLE:
-    {
-      int seekpoint_count, i;
-
-      seekpoint_count = blk_len / FLAC_SEEKPOINT_SIZE;
-      for (i = 0; i < seekpoint_count; i++)
-        if (stream_skip (s, FLAC_SEEKPOINT_SIZE) != 1)
-          return;
-      break;
-    }
-
     case FLAC_VORBIS_COMMENT:
     {
       /* For a description of the format please have a look at */
@@ -248,8 +228,10 @@
       break;
     }
 
+    case FLAC_STREAMINFO:
     case FLAC_PADDING:
     case FLAC_APPLICATION:
+    case FLAC_SEEKTABLE:
     case FLAC_CUESHEET:
     default: 
       /* 6-127 are presently reserved */