summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorDiego 'Flameeyes' Pettenò <flameeyes@gmail.com>2007-11-01 19:28:23 +0100
committerDiego 'Flameeyes' Pettenò <flameeyes@gmail.com>2007-11-01 19:28:23 +0100
commit4eb04918173bb229623e500b376caf391442ac0b (patch)
tree407b2717bd4877e8825a062d6c51ff5f842aaa88 /src
parent02a0a73283aed7106e2a2cf49ab1d996df7a93d0 (diff)
downloadxine-lib-4eb04918173bb229623e500b376caf391442ac0b.tar.gz
xine-lib-4eb04918173bb229623e500b376caf391442ac0b.tar.bz2
Update contributed libfaad (faad2) to version 2.6.1.
Since the release 2.6.1 of faad2 the source code for libfaad is now once again released under a GPL-compatible license (actually, GPL2 plus commercial licenses sold by Nero AG, and a note about clarifying who's copyright it is). As we were using a possibly buggy old CVS snapshot of faad2 from before 2.5 release, the update might fix some buggy AAC files or streams. The updated xine-lib was tested against iTunes Plus audio files, Japan-A-Radio stream, SKY.fm streams, and Apple HD trailers, no regression seems to be present.
Diffstat (limited to 'src')
-rw-r--r--src/libxineadec/xine_faad_decoder.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libxineadec/xine_faad_decoder.c b/src/libxineadec/xine_faad_decoder.c
index 72eec08a8..de2e96177 100644
--- a/src/libxineadec/xine_faad_decoder.c
+++ b/src/libxineadec/xine_faad_decoder.c
@@ -240,7 +240,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=%"PRId32" channels=%d used=%d\n",
+ lprintf("NeAACDecDecode() 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);