diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-10-17 16:19:57 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-10-17 16:19:57 -0400 |
| commit | 77dc594e79118769087c0e2094c303fc5aaea5d4 (patch) | |
| tree | ed538b0b4e1d0b1de7ecbf22f701bbb1595b967c /indra/llaudio/llvorbisencode.cpp | |
| parent | 94c137d5c970bc01e3a4dbe8de6a7104085e5ba6 (diff) | |
| parent | 1afbdc79c6fb911a5ab2c87067e7b99bec92fbc6 (diff) | |
merge back late changes and tags from release branch
Diffstat (limited to 'indra/llaudio/llvorbisencode.cpp')
| -rw-r--r-- | indra/llaudio/llvorbisencode.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/indra/llaudio/llvorbisencode.cpp b/indra/llaudio/llvorbisencode.cpp index 44eeea0ca4..0e0c80a456 100644 --- a/indra/llaudio/llvorbisencode.cpp +++ b/indra/llaudio/llvorbisencode.cpp @@ -82,7 +82,8 @@ S32 check_for_invalid_wav_formats(const std::string& in_fname, std::string& erro error_msg.clear(); //******************************** - LLAPRFile infile(in_fname, LL_APR_RB); + LLAPRFile infile ; + infile.open(in_fname,LL_APR_RB); //******************************** if (!infile.getFileHandle()) { @@ -232,7 +233,8 @@ S32 encode_vorbis_file(const std::string& in_fname, const std::string& out_fname S32 data_left = 0; - LLAPRFile infile(in_fname,LL_APR_RB); + LLAPRFile infile ; + infile.open(in_fname,LL_APR_RB); if (!infile.getFileHandle()) { llwarns << "Couldn't open temporary ogg file for writing: " << in_fname @@ -240,7 +242,8 @@ S32 encode_vorbis_file(const std::string& in_fname, const std::string& out_fname return(LLVORBISENC_SOURCE_OPEN_ERR); } - LLAPRFile outfile(out_fname, LL_APR_WPB); + LLAPRFile outfile ; + outfile.open(out_fname,LL_APR_WPB); if (!outfile.getFileHandle()) { llwarns << "Couldn't open upload sound file for reading: " << in_fname |