← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/faac/oneiric

« back to all changes in this revision

Viewing changes to common/mp4v2/atom_root.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Maia Kozheva
  • Date: 2011-06-09 12:00:51 UTC
  • mfrom: (1.1.2 upstream)
  • Revision ID: james.westby@ubuntu.com-20110609120051-03a45t9zrp0xiu9k
Tags: 1.28-0ubuntu1
https://launchpad.net/bugs/395902
https://launchpad.net/bugs/374900
* New upstream release. Package based on Debian Multimedia team git.
  (LP: #395902)
* debian/copyright documents all applicable licenses. The package as a whole
  is not LGPL and will stay in multiverse. (LP: #374900)
* Back to using a bundled internal copy of libmp4v2 in the frontend. The
  external libmp4v2 will eventually be removed.

Show diffs side-by-side

added added

removed removed

Lines of Context:
common/mp4v2/atom_root.cpp
24
24
MP4RootAtom::MP4RootAtom() 
25
25
        : MP4Atom(NULL)
26
26
{
27
 
        ExpectChildAtom("ftyp", Required, OnlyOne);
28
27
        ExpectChildAtom("moov", Required, OnlyOne);
 
28
        ExpectChildAtom("ftyp", Optional, OnlyOne);
29
29
        ExpectChildAtom("mdat", Optional, Many);
30
30
        ExpectChildAtom("free", Optional, Many);
31
31
        ExpectChildAtom("skip", Optional, Many);
85
85
                }
86
86
        }
87
87
        ASSERT(i < size);
 
88
        ASSERT(pMoovAtom != NULL);
88
89
 
89
90
        // rewrite moov so that updated chunkOffsets are written to disk
90
91
        m_pFile->SetPosition(pMoovAtom->GetStart());