| Index: services/media/framework/stages/output.cc
|
| diff --git a/services/media/framework/stages/output.cc b/services/media/framework/stages/output.cc
|
| index 1180cf811d6aa9309c287b1b27cdbb55d7c72f4c..d3198af9587212fa7498c708ec6258eae3dfaed1 100644
|
| --- a/services/media/framework/stages/output.cc
|
| +++ b/services/media/framework/stages/output.cc
|
| @@ -9,9 +9,7 @@
|
| namespace mojo {
|
| namespace media {
|
|
|
| -Output::Output() :
|
| - demand_(Demand::kNegative),
|
| - copy_allocator_(nullptr) {}
|
| +Output::Output() : demand_(Demand::kNegative), copy_allocator_(nullptr) {}
|
|
|
| Output::~Output() {}
|
|
|
| @@ -51,7 +49,7 @@ void Output::SupplyPacket(PacketPtr packet, Engine* engine) const {
|
| if (copy_allocator_ != nullptr) {
|
| // Need to copy the packet due to an allocation conflict.
|
| size_t size = packet->size();
|
| - void *buffer;
|
| + void* buffer;
|
|
|
| if (size == 0) {
|
| buffer = nullptr;
|
| @@ -64,12 +62,8 @@ void Output::SupplyPacket(PacketPtr packet, Engine* engine) const {
|
| memcpy(buffer, packet->payload(), size);
|
| }
|
|
|
| - packet = Packet::Create(
|
| - packet->pts(),
|
| - packet->end_of_stream(),
|
| - size,
|
| - buffer,
|
| - copy_allocator_);
|
| + packet = Packet::Create(packet->pts(), packet->end_of_stream(), size,
|
| + buffer, copy_allocator_);
|
| }
|
|
|
| if (actual_mate().SupplyPacketFromOutput(std::move(packet))) {
|
|
|