Snap for 6634012 from 50b8acd4 to rvc-release

                // After an error, replace bufferSize with the sum of the

                // decodedSizes to resynchronize the in/out lists.

                inInfo.decodedSizes.pop_back();

                inInfo.bufferSize = std::accumulate(

                        inInfo.decodedSizes.begin(), inInfo.decodedSizes.end(), 0);