2.0. audio_decoder: Fixed audio regression bug.

git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/branches/2.0.0.2@947 362d55ac-95cf-4e76-9f9a-cbaa9c17b72d

diff --git a/modules/ffmpeg/producer/audio/audio_decoder.cpp b/modules/ffmpeg/producer/audio/audio_decoder.cpp
index 3fdb02c3be67e706595a422e1a0d363f1c2def34..13ede2f734238635e608495fa256e541d1d74346 100644 (file)
--- a/modules/ffmpeg/producer/audio/audio_decoder.cpp
+++ b/modules/ffmpeg/producer/audio/audio_decoder.cpp
@@ -70,9 +70,9 @@ public:
                }\r
        }\r
                \r
-       std::deque<std::pair<int, std::vector<short>>> receive()\r
+       std::deque<std::pair<int, std::vector<int16_t>>> receive()\r
        {\r
-               std::deque<std::pair<int, std::vector<short>>> result;\r
+               std::deque<std::pair<int, std::vector<int16_t>>> result;\r
                \r
                std::shared_ptr<AVPacket> pkt;\r
                for(int n = 0; n < 32 && result.empty() && input_.try_pop_audio_packet(pkt); ++n)       \r
@@ -107,7 +107,7 @@ public:
                                boost::errinfo_errno(AVUNERROR(errn)));\r
                }\r
 \r
-               current_chunk_.insert(current_chunk_.begin(), buffer_.begin(), buffer_.begin() + written_bytes/2);\r
+               current_chunk_.insert(current_chunk_.end(), buffer_.begin(), buffer_.begin() + written_bytes/2);\r
 \r
                const auto last = current_chunk_.end() - current_chunk_.size() % format_desc_.audio_samples_per_frame;\r
                \r