From 2f78cf3f521aaaec82611c9a961387653183eb40 Mon Sep 17 00:00:00 2001
From: philippegorley <philippe.gorley@savoirfairelinux.com>
Date: Wed, 14 Nov 2018 09:44:01 -0500
Subject: [PATCH] media_stream: fix potential shadow warning
Change-Id: If428b0f9098ed72c2af04ad11c6cdb717d535536
---
src/media/media_stream.h | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/media/media_stream.h b/src/media/media_stream.h
index a5c5421eba..1a8909a0f2 100644
--- a/src/media/media_stream.h
+++ b/src/media/media_stream.h
@@ -71,12 +71,12 @@ struct MediaStream {
: MediaStream(streamName, fmt, 0)
{}
- MediaStream(const std::string& streamName, AudioFormat fmt, int64_t firstTimestamp)
+ MediaStream(const std::string& streamName, AudioFormat fmt, int64_t startTimestamp)
: name(streamName)
, format(fmt.sampleFormat)
, isVideo(false)
, timeBase(1, fmt.sample_rate)
- , firstTimestamp(firstTimestamp)
+ , firstTimestamp(startTimestamp)
, sampleRate(fmt.sample_rate)
, nbChannels(fmt.nb_channels)
, frameSize(fmt.sample_rate / 50) // standard frame size for our encoder is 20 ms
@@ -86,9 +86,9 @@ struct MediaStream {
: MediaStream(streamName, c, 0)
{}
- MediaStream(const std::string& streamName, AVCodecContext* c, int64_t firstTimestamp)
+ MediaStream(const std::string& streamName, AVCodecContext* c, int64_t startTimestamp)
: name(streamName)
- , firstTimestamp(firstTimestamp)
+ , firstTimestamp(startTimestamp)
{
timeBase = c->time_base;
switch (c->codec_type) {
--
GitLab