Commit 2f78cf3f authored by Philippe Gorley's avatar Philippe Gorley Committed by Philippe Gorley

media_stream: fix potential shadow warning

Change-Id: If428b0f9098ed72c2af04ad11c6cdb717d535536
parent 66a0af90
......@@ -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) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment