summaryrefslogtreecommitdiff
path: root/src/libfaad
diff options
context:
space:
mode:
Diffstat (limited to 'src/libfaad')
-rw-r--r--src/libfaad/.hgignore (renamed from src/libfaad/.cvsignore)0
-rw-r--r--src/libfaad/Makefile.am2
-rw-r--r--src/libfaad/codebook/.hgignore (renamed from src/libfaad/codebook/.cvsignore)0
-rw-r--r--src/libfaad/xine_decoder.c8
4 files changed, 5 insertions, 5 deletions
diff --git a/src/libfaad/.cvsignore b/src/libfaad/.hgignore
index 7d926a554..7d926a554 100644
--- a/src/libfaad/.cvsignore
+++ b/src/libfaad/.hgignore
diff --git a/src/libfaad/Makefile.am b/src/libfaad/Makefile.am
index cef72a4ce..dcc57792a 100644
--- a/src/libfaad/Makefile.am
+++ b/src/libfaad/Makefile.am
@@ -55,7 +55,7 @@ xineplug_decode_faad_la_SOURCES = \
xine_decoder.c
xineplug_decode_faad_la_LDFLAGS = -avoid-version -module
-xineplug_decode_faad_la_LIBADD = $(XINE_LIB)
+xineplug_decode_faad_la_LIBADD = -lm $(XINE_LIB)
noinst_HEADERS = \
analysis.h \
diff --git a/src/libfaad/codebook/.cvsignore b/src/libfaad/codebook/.hgignore
index 282522db0..282522db0 100644
--- a/src/libfaad/codebook/.cvsignore
+++ b/src/libfaad/codebook/.hgignore
diff --git a/src/libfaad/xine_decoder.c b/src/libfaad/xine_decoder.c
index bf6e9183c..aa528a34d 100644
--- a/src/libfaad/xine_decoder.c
+++ b/src/libfaad/xine_decoder.c
@@ -17,7 +17,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*
- * $Id: xine_decoder.c,v 1.48 2006/07/10 22:08:29 dgp85 Exp $
+ * $Id: xine_decoder.c,v 1.49 2007/02/20 00:34:57 dgp85 Exp $
*
*/
@@ -140,7 +140,7 @@ static int faad_open_dec( faad_decoder_t *this ) {
_("libfaad: libfaad NeAACDecInit2 failed.\n"));
this->faac_failed++;
} else
- lprintf( "NeAACDecInit2 returned rate=%ld channels=%d\n",
+ lprintf( "NeAACDecInit2 returned rate=%"PRId32" channels=%d\n",
this->rate, this->num_channels );
} else {
used = NeAACDecInit(this->faac_dec, this->buf, this->size,
@@ -151,7 +151,7 @@ static int faad_open_dec( faad_decoder_t *this ) {
_("libfaad: libfaad NeAACDecInit failed.\n"));
this->faac_failed++;
} else {
- lprintf( "NeAACDecInit() returned rate=%ld channels=%d (used=%d)\n",
+ lprintf( "NeAACDecInit() returned rate=%"PRId32" channels=%d (used=%d)\n",
this->rate, this->num_channels, used);
this->size -= used;
@@ -239,7 +239,7 @@ static void faad_decode_audio ( faad_decoder_t *this, int end_frame ) {
this->num_channels = this->faac_finfo.channels;
this->rate = this->faac_finfo.samplerate;
- lprintf("faacDecDecode() returned rate=%ld channels=%d used=%d\n",
+ lprintf("faacDecDecode() returned rate=%"PRId32" channels=%d used=%d\n",
this->rate, this->num_channels, used);
this->stream->audio_out->close (this->stream->audio_out, this->stream);