summaryrefslogtreecommitdiffstats
path: root/libfaad2/output.h
diff options
context:
space:
mode:
authordiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2004-06-02 22:59:04 +0000
committerdiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2004-06-02 22:59:04 +0000
commit228ca70d485e2660c2e381d7112cbcca65c156a0 (patch)
treef7ab4303f2daa68c76271787a60d50cb1ada2e46 /libfaad2/output.h
parenteb1dee5cbf86fba8d5081bae6071cc4a4fd68306 (diff)
downloadmpv-228ca70d485e2660c2e381d7112cbcca65c156a0.tar.bz2
mpv-228ca70d485e2660c2e381d7112cbcca65c156a0.tar.xz
update to the 2.0 release of faad, patch by adland
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12528 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libfaad2/output.h')
-rw-r--r--libfaad2/output.h7
1 files changed, 2 insertions, 5 deletions
diff --git a/libfaad2/output.h b/libfaad2/output.h
index 1e2aa48a92..abce9c2470 100644
--- a/libfaad2/output.h
+++ b/libfaad2/output.h
@@ -1,6 +1,6 @@
/*
** FAAD2 - Freeware Advanced Audio (AAC) Decoder including SBR decoding
-** Copyright (C) 2003 M. Bakker, Ahead Software AG, http://www.nero.com
+** Copyright (C) 2003-2004 M. Bakker, Ahead Software AG, http://www.nero.com
**
** This program is free software; you can redistribute it and/or modify
** it under the terms of the GNU General Public License as published by
@@ -22,7 +22,7 @@
** Commercial non-GPL licensing of this software is possible.
** For more info contact Ahead Software through Mpeg4AAClicense@nero.com.
**
-** $Id: output.h,v 1.9 2003/09/09 18:09:52 menno Exp $
+** $Id: output.h,v 1.2 2003/10/03 22:22:27 alex Exp $
**/
#ifndef __OUTPUT_H__
@@ -39,9 +39,6 @@ void* output_to_PCM(faacDecHandle hDecoder,
uint16_t frame_len,
uint8_t format);
-static int64_t dither_output(uint8_t dithering, uint8_t shapingtype,
- uint16_t i, double Sum, uint8_t k);
-
#ifdef __cplusplus
}
#endif