generic-library/webm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

mkvmuxer: default track_num to 0 in AddTrack

Browse Source 
Change-Id: I484cb56df7be7677a821db262c75cf8bdf1d30af
This commit is contained in:
Matthew Heaney
2012-09-14 17:52:20 -07:00
parent 76d9cf9cf4
commit 4ffb162798
2 changed files with 0 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
mkvmuxer.cpp
View File

@@ -1564,10 +1564,6 @@ bool Segment::Finalize() {
return true; return true;
} }
uint64 Segment::AddVideoTrack(int32 width, int32 height) {
return AddVideoTrack(width, height, 0);
}
uint64 Segment::AddVideoTrack(int32 width, int32 height, int32 number) { uint64 Segment::AddVideoTrack(int32 width, int32 height, int32 number) {
VideoTrack* const vid_track = new (std::nothrow) VideoTrack(); // NOLINT VideoTrack* const vid_track = new (std::nothrow) VideoTrack(); // NOLINT
if (!vid_track) if (!vid_track)
@@ -1584,10 +1580,6 @@ uint64 Segment::AddVideoTrack(int32 width, int32 height, int32 number) {
return vid_track->number(); return vid_track->number();
} }
uint64 Segment::AddAudioTrack(int32 sample_rate, int32 channels) {
return AddAudioTrack(sample_rate, channels, 0);
}
uint64 Segment::AddAudioTrack(int32 sample_rate, uint64 Segment::AddAudioTrack(int32 sample_rate,
int32 channels, int32 channels,
int32 number) { int32 number) {

8
mkvmuxer.hpp
View File

@@ -667,10 +667,6 @@ class Segment {
// |ptr_writer| is NULL. // |ptr_writer| is NULL.
bool Init(IMkvWriter* ptr_writer); bool Init(IMkvWriter* ptr_writer);
// Adds an audio track to the segment. Returns the number of the track on
// success, 0 on error.
uint64 AddAudioTrack(int32 sample_rate, int32 channels);
// Adds an audio track to the segment. Returns the number of the track on // Adds an audio track to the segment. Returns the number of the track on
// success, 0 on error. |number| is the number to use for the audio track. // success, 0 on error. |number| is the number to use for the audio track.
// |number| must be >= 0. If |number| == 0 then the muxer will decide on // |number| must be >= 0. If |number| == 0 then the muxer will decide on
@@ -691,10 +687,6 @@ class Segment {
uint64 timestamp_ns, uint64 timestamp_ns,
bool is_key); bool is_key);
// Adds a video track to the segment. Returns the number of the track on
// success, 0 on error.
uint64 AddVideoTrack(int32 width, int32 height);
// Adds a video track to the segment. Returns the number of the track on // Adds a video track to the segment. Returns the number of the track on
// success, 0 on error. |number| is the number to use for the video track. // success, 0 on error. |number| is the number to use for the video track.
// |number| must be >= 0. If |number| == 0 then the muxer will decide on // |number| must be >= 0. If |number| == 0 then the muxer will decide on