From 9c02f8624b20f64ab44f0caba9f7603574a75e21 Mon Sep 17 00:00:00 2001 From: "vitalybuka@chromium.org" Date: Fri, 20 Jul 2012 03:32:08 +0000 Subject: Disallowed operator= to fix build on Visual Studio 2010. Definition of TrackRunInfo is required to compile std::vector::opearator= Fixed linking error on FileType if incremental_chrome_dll=1 component=shared_library. BUG=None TEST=None Review URL: https://chromiumcodereview.appspot.com/10808039 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@147610 0039d316-1c4b-4281-b951-d872f2087c98 --- media/mp4/box_definitions.cc | 4 ++++ media/mp4/track_run_iterator.h | 2 ++ 2 files changed, 6 insertions(+) (limited to 'media') diff --git a/media/mp4/box_definitions.cc b/media/mp4/box_definitions.cc index ebfeae7..c9245d8 100644 --- a/media/mp4/box_definitions.cc +++ b/media/mp4/box_definitions.cc @@ -11,6 +11,10 @@ namespace media { namespace mp4 { +FileType::FileType() {} +FileType::~FileType() {} +FourCC FileType::BoxType() const { return FOURCC_FTYP; } + bool FileType::Parse(BoxReader* reader) { RCHECK(reader->ReadFourCC(&major_brand) && reader->Read4(&minor_version)); size_t num_brands = (reader->size() - reader->pos()) / sizeof(FourCC); diff --git a/media/mp4/track_run_iterator.h b/media/mp4/track_run_iterator.h index 8c31002..ddea39c 100644 --- a/media/mp4/track_run_iterator.h +++ b/media/mp4/track_run_iterator.h @@ -79,6 +79,8 @@ class MEDIA_EXPORT TrackRunIterator { int64 sample_dts_; int64 sample_offset_; + + DISALLOW_COPY_AND_ASSIGN(TrackRunIterator); }; } // namespace mp4 -- cgit v1.1