changeset 1003:2c9d1eb6e8a6 trunk

[svn] - fix itunes7 hack
author nenolod
date Sun, 06 May 2007 10:59:18 -0700
parents ad29227009f6
children be2d04b2bd28
files ChangeLog src/alac/demux.c
diffstat 2 files changed, 9 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Sat May 05 12:11:33 2007 -0700
+++ b/ChangeLog	Sun May 06 10:59:18 2007 -0700
@@ -1,3 +1,11 @@
+2007-05-05 19:11:33 +0000  Jonathan Schleifer <js@h3c.de>
+  revision [2168]
+  ifdef filewriter/flac.c out completely if FILEWRITER_FLAC isn't defined
+  
+  trunk/src/filewriter/flac.c |    5 +++++
+  1 file changed, 5 insertions(+)
+
+
 2007-05-05 12:14:02 +0000  Michael Farber <01mf02@gmail.com>
   revision [2166]
   - configure.ac changes for FileWriter (are likely to have to be fixed)
--- a/src/alac/demux.c	Sat May 05 12:11:33 2007 -0700
+++ b/src/alac/demux.c	Sun May 06 10:59:18 2007 -0700
@@ -703,9 +703,7 @@
 
         chunk_len = stream_read_uint32(qtmovie->stream);
         if (stream_eof(qtmovie->stream))
-        {
             return 0;
-        }
 
         if (chunk_len == 1)
             return 0;
@@ -721,9 +719,7 @@
             if (read_chunk_moov(qtmovie, chunk_len) == 0)
 	        return 0; /* failed to read moov, can't do anything */
             if (found_mdat)
-            {
                 return set_saved_mdat(qtmovie);
-            }
             found_moov = 1;
             break;
             /* if we hit mdat before we've found moov, record the position
@@ -742,9 +738,7 @@
             stream_skip(qtmovie->stream, chunk_len - 8); /* FIXME not 8 */
             break;
         default:
-            stream_skip(qtmovie->stream, chunk_len - 8); /* FIXME not 8 */
-	    return 1;
-	    break;
+	    return found_moov;
         }
 
     }