diff options
| author | acolwell@chromium.org <acolwell@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-20 20:17:58 +0000 |
|---|---|---|
| committer | acolwell@chromium.org <acolwell@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-20 20:17:58 +0000 |
| commit | 420246cfcbc179b3df85e493a45fd565ac818083 (patch) | |
| tree | 31d59a9f2f16286bb9550f5c6cf8e6de6a202932 /media | |
| parent | fee229d27e5a29ad0df8a1ccc76d9eb51b5a9724 (diff) | |
| download | chromium_src-420246cfcbc179b3df85e493a45fd565ac818083.zip chromium_src-420246cfcbc179b3df85e493a45fd565ac818083.tar.gz chromium_src-420246cfcbc179b3df85e493a45fd565ac818083.tar.bz2 | |
Fix ContentEncodings element info.
The ContentEncoding's element info was accidentally added to the
TrackOperations element instead of TrackEntry. These changes fix
that mistake.
TBR=scherkus@chromium.org
BUG=110531
TEST=None
Review URL: http://codereview.chromium.org/9270013
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@118479 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media')
| -rw-r--r-- | media/webm/webm_parser.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/media/webm/webm_parser.cc b/media/webm/webm_parser.cc index f252e6e..777ec91 100644 --- a/media/webm/webm_parser.cc +++ b/media/webm/webm_parser.cc @@ -165,6 +165,7 @@ static const ElementIdInfo kTrackEntryIds[] = { {LIST, kWebMIdVideo}, {LIST, kWebMIdAudio}, {LIST, kWebMIdTrackOperation}, + {LIST, kWebMIdContentEncodings}, }; static const ElementIdInfo kTrackTranslateIds[] = { @@ -199,7 +200,6 @@ static const ElementIdInfo kAudioIds[] = { static const ElementIdInfo kTrackOperationIds[] = { {LIST, kWebMIdTrackCombinePlanes}, {LIST, kWebMIdJoinBlocks}, - {LIST, kWebMIdContentEncodings}, }; static const ElementIdInfo kTrackCombinePlanesIds[] = { @@ -373,10 +373,10 @@ static const ListElementInfo kListElementInfo[] = { LIST_ELEMENT_INFO(kWebMIdTrackCombinePlanes, 4, kTrackCombinePlanesIds), LIST_ELEMENT_INFO(kWebMIdTrackPlane, 5, kTrackPlaneIds), LIST_ELEMENT_INFO(kWebMIdJoinBlocks, 4, kJoinBlocksIds), - LIST_ELEMENT_INFO(kWebMIdContentEncodings, 4, kContentEncodingsIds), - LIST_ELEMENT_INFO(kWebMIdContentEncoding, 5, kContentEncodingIds), - LIST_ELEMENT_INFO(kWebMIdContentCompression, 6, kContentCompressionIds), - LIST_ELEMENT_INFO(kWebMIdContentEncryption, 6, kContentEncryptionIds), + LIST_ELEMENT_INFO(kWebMIdContentEncodings, 3, kContentEncodingsIds), + LIST_ELEMENT_INFO(kWebMIdContentEncoding, 4, kContentEncodingIds), + LIST_ELEMENT_INFO(kWebMIdContentCompression, 5, kContentCompressionIds), + LIST_ELEMENT_INFO(kWebMIdContentEncryption, 5, kContentEncryptionIds), LIST_ELEMENT_INFO(kWebMIdCues, 1, kCuesIds), LIST_ELEMENT_INFO(kWebMIdCuePoint, 2, kCuePointIds), LIST_ELEMENT_INFO(kWebMIdCueTrackPositions, 3, kCueTrackPositionsIds), |