Merge remote-tracking branch 'upstream/master' into m4a-feature

This commit is contained in:
Chris Smowton
2014-12-20 19:04:09 +00:00
109 changed files with 3865 additions and 419 deletions

View File

@@ -526,7 +526,7 @@ RDAudioConvert::ErrorCode RDAudioConvert::Stage1Vorbis(const QString &dstfile,
#endif // HAVE_VORBIS
}
#define STAGE1BUFSIZE 2500
#define STAGE1BUFSIZE 16384
RDAudioConvert::ErrorCode RDAudioConvert::Stage1Mpeg(const QString &dstfile,
RDWaveFile *wave)