Revert change from auto_ptr to unique_ptr in sample code.
This allows users of the legacy makefile on older systems without C++11 compiler support to continue using libwebm sample code. Change-Id: I1dd9487e0d87e355d2394fedb12ec8628a955413
This commit is contained in:
@@ -115,7 +115,7 @@ int main(int argc, char* argv[]) {
|
|||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
const std::unique_ptr<seg_t> pSegment(pSegment_);
|
const std::auto_ptr<seg_t> pSegment(pSegment_);
|
||||||
|
|
||||||
ret = pSegment->Load();
|
ret = pSegment->Load();
|
||||||
if (ret < 0) {
|
if (ret < 0) {
|
||||||
|
|||||||
@@ -358,7 +358,7 @@ int main(int argc, char* argv[]) {
|
|||||||
return EXIT_FAILURE;
|
return EXIT_FAILURE;
|
||||||
}
|
}
|
||||||
|
|
||||||
const std::unique_ptr<mkvparser::Segment> parser_segment(parser_segment_);
|
const std::auto_ptr<mkvparser::Segment> parser_segment(parser_segment_);
|
||||||
ret = parser_segment->Load();
|
ret = parser_segment->Load();
|
||||||
if (ret < 0) {
|
if (ret < 0) {
|
||||||
printf("\n Segment::Load() failed.");
|
printf("\n Segment::Load() failed.");
|
||||||
|
|||||||
@@ -26,7 +26,7 @@ namespace vttdemux {
|
|||||||
|
|
||||||
typedef long long mkvtime_t; // NOLINT
|
typedef long long mkvtime_t; // NOLINT
|
||||||
typedef long long mkvpos_t; // NOLINT
|
typedef long long mkvpos_t; // NOLINT
|
||||||
typedef std::unique_ptr<mkvparser::Segment> segment_ptr_t;
|
typedef std::auto_ptr<mkvparser::Segment> segment_ptr_t;
|
||||||
|
|
||||||
// WebVTT metadata tracks have a type (encoded in the CodecID for the track).
|
// WebVTT metadata tracks have a type (encoded in the CodecID for the track).
|
||||||
// We use |type| to synthesize a filename for the out-of-band WebVTT |file|.
|
// We use |type| to synthesize a filename for the out-of-band WebVTT |file|.
|
||||||
|
|||||||
Reference in New Issue
Block a user