ref: 779598b7a137b8eefaae16af0a3e97c66bd8d26e
parent: 66d8df22327a5fdbd814681e8d38be4ffdf896db
author: menno <menno>
date: Fri Nov 21 13:20:57 EST 2003
Fixed stupid bug with unsigned variable in new mp4 library
--- a/common/mp4ff/mp4atom.c
+++ b/common/mp4ff/mp4atom.c
@@ -22,7 +22,7 @@
** Commercial non-GPL licensing of this software is possible.
** For more info contact Ahead Software through Mpeg4AAClicense@nero.com.
**
-** $Id: mp4atom.c,v 1.1 2003/11/21 15:08:48 menno Exp $
+** $Id: mp4atom.c,v 1.2 2003/11/21 18:20:56 menno Exp $
**/
#include <stdlib.h>
@@ -392,7 +392,7 @@
return 0;
}
-int32_t mp4ff_atom_read(mp4ff_t *f, int32_t size, int8_t atom_type)
+int32_t mp4ff_atom_read(mp4ff_t *f, int32_t size, uint8_t atom_type)
{
if (atom_type == ATOM_STSZ)
{
--- a/common/mp4ff/mp4ff.h
+++ b/common/mp4ff/mp4ff.h
@@ -22,7 +22,7 @@
** Commercial non-GPL licensing of this software is possible.
** For more info contact Ahead Software through Mpeg4AAClicense@nero.com.
**
-** $Id: mp4ff.h,v 1.4 2003/11/21 15:08:48 menno Exp $
+** $Id: mp4ff.h,v 1.5 2003/11/21 18:20:57 menno Exp $
**/
#ifndef MP4FF_H
@@ -193,7 +193,7 @@
int32_t mp4ff_read_stsc(mp4ff_t *f);
int32_t mp4ff_read_stco(mp4ff_t *f);
int32_t mp4ff_read_stts(mp4ff_t *f);
-int32_t mp4ff_atom_read(mp4ff_t *f, int32_t size, int8_t atom_type);
+int32_t mp4ff_atom_read(mp4ff_t *f, int32_t size, uint8_t atom_type);
/* mp4sample.c */
int32_t mp4ff_chunk_of_sample(mp4ff_t *f, int32_t track, int32_t sample,
--- a/frontend/main.c
+++ b/frontend/main.c
@@ -22,7 +22,7 @@
** Commercial non-GPL licensing of this software is possible.
** For more info contact Ahead Software through Mpeg4AAClicense@nero.com.
**
-** $Id: main.c,v 1.61 2003/11/21 15:09:16 menno Exp $
+** $Id: main.c,v 1.62 2003/11/21 18:20:57 menno Exp $
**/
#ifdef _WIN32
@@ -664,7 +664,7 @@
free(buff);
if (rc < 0)
- return -1;
+ continue;
return i;
}
}
--- a/libfaad/libfaad.dsp
+++ b/libfaad/libfaad.dsp
@@ -40,8 +40,8 @@
# PROP Output_Dir "Release"
# PROP Intermediate_Dir "Release"
# PROP Target_Dir ""
-MTL=midl.exe
F90=df.exe
+MTL=midl.exe
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
# ADD CPP /nologo /G6 /MD /W3 /GX /O2 /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /FD /c
# ADD BASE RSC /l 0x413 /d "NDEBUG"
@@ -65,10 +65,10 @@
# PROP Output_Dir "Debug"
# PROP Intermediate_Dir "Debug"
# PROP Target_Dir ""
-MTL=midl.exe
F90=df.exe
+MTL=midl.exe
# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
-# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
# ADD BASE RSC /l 0x413 /d "_DEBUG"
# ADD RSC /l 0x413 /d "_DEBUG"
BSC32=bscmake.exe