summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorreimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2008-04-12 15:16:37 +0000
committerreimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2008-04-12 15:16:37 +0000
commit71ed16bbb41ea6d9830ec7181104126406b83c03 (patch)
tree17ba8068b10414ed96931f14bca4f76bf42ded4c
parent4d4cb3a3f221a7f23387a8532cbdacd8c4d5ba9a (diff)
downloadmpv-71ed16bbb41ea6d9830ec7181104126406b83c03.tar.bz2
mpv-71ed16bbb41ea6d9830ec7181104126406b83c03.tar.xz
Remove another two useless special-case from flac metadata reading function
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26408 b3059339-0415-0410-9bf9-f77b7e298cf2
-rw-r--r--libmpdemux/demux_audio.c22
1 files changed, 2 insertions, 20 deletions
diff --git a/libmpdemux/demux_audio.c b/libmpdemux/demux_audio.c
index 0639022b86..032c739fc6 100644
--- a/libmpdemux/demux_audio.c
+++ b/libmpdemux/demux_audio.c
@@ -168,26 +168,6 @@ get_flac_metadata (demuxer_t* demuxer)
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 @@ get_flac_metadata (demuxer_t* demuxer)
break;
}
+ case FLAC_STREAMINFO:
case FLAC_PADDING:
case FLAC_APPLICATION:
+ case FLAC_SEEKTABLE:
case FLAC_CUESHEET:
default:
/* 6-127 are presently reserved */