summaryrefslogtreecommitdiffstats
path: root/stream
diff options
context:
space:
mode:
authorreimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2008-01-19 16:57:53 +0000
committerreimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2008-01-19 16:57:53 +0000
commite1c3f319f2631449fc50e637a4d7e0e89f2e9842 (patch)
treede4c204aa99dcef7a0679eca7450dbf005d6f7c4 /stream
parent5efa59daeb07445cb0785300c8add82c6b87929e (diff)
downloadmpv-e1c3f319f2631449fc50e637a4d7e0e89f2e9842.tar.bz2
mpv-e1c3f319f2631449fc50e637a4d7e0e89f2e9842.tar.xz
Simplify and keep terminating end-of-line
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25807 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'stream')
-rw-r--r--stream/stream_cddb.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/stream/stream_cddb.c b/stream/stream_cddb.c
index ada943757f..e17595b69e 100644
--- a/stream/stream_cddb.c
+++ b/stream/stream_cddb.c
@@ -442,13 +442,13 @@ cddb_read_parse(HTTP_header_t *http_hdr, cddb_data_t *cddb_data) {
ptr = strdup(ptr);
// Ok found the beginning of the file
// look for the end
- ptr2 = strstr(ptr, "\r\n.\r\n");
- if( ptr2==NULL ) {
+ ptr2 = strstr(ptr, "\n.\r\n");
+ if (!ptr2)
ptr2 = strstr(ptr, "\n.\n");
- if( ptr2==NULL ) {
+ if (ptr2) ptr2++;
+ else {
mp_msg(MSGT_DEMUX, MSGL_FIXME, "Unable to find '.'\n");
ptr2=ptr+strlen(ptr); //return -1;
- }
}
// Ok found the end
// do a sanity check