Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
jami-daemon
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
savoirfairelinux
jami-daemon
Commits
2f78cf3f
Commit
2f78cf3f
authored
6 years ago
by
Philippe Gorley
Committed by
Philippe Gorley
6 years ago
Browse files
Options
Downloads
Patches
Plain Diff
media_stream: fix potential shadow warning
Change-Id: If428b0f9098ed72c2af04ad11c6cdb717d535536
parent
66a0af90
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/media/media_stream.h
+4
-4
4 additions, 4 deletions
src/media/media_stream.h
with
4 additions
and
4 deletions
src/media/media_stream.h
+
4
−
4
View file @
2f78cf3f
...
...
@@ -71,12 +71,12 @@ struct MediaStream {
:
MediaStream
(
streamName
,
fmt
,
0
)
{}
MediaStream
(
const
std
::
string
&
streamName
,
AudioFormat
fmt
,
int64_t
firs
tTimestamp
)
MediaStream
(
const
std
::
string
&
streamName
,
AudioFormat
fmt
,
int64_t
star
tTimestamp
)
:
name
(
streamName
)
,
format
(
fmt
.
sampleFormat
)
,
isVideo
(
false
)
,
timeBase
(
1
,
fmt
.
sample_rate
)
,
firstTimestamp
(
firs
tTimestamp
)
,
firstTimestamp
(
star
tTimestamp
)
,
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
firs
tTimestamp
)
MediaStream
(
const
std
::
string
&
streamName
,
AVCodecContext
*
c
,
int64_t
star
tTimestamp
)
:
name
(
streamName
)
,
firstTimestamp
(
firs
tTimestamp
)
,
firstTimestamp
(
star
tTimestamp
)
{
timeBase
=
c
->
time_base
;
switch
(
c
->
codec_type
)
{
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment