summaryrefslogtreecommitdiff
path: root/indra/media_plugins
diff options
context:
space:
mode:
authorLoren Shih <seraph@lindenlab.com>2010-02-03 19:47:24 -0500
committerLoren Shih <seraph@lindenlab.com>2010-02-03 19:47:24 -0500
commitfae0d9c309c33f853a8579080cbf1ddbd849e1ef (patch)
tree57128bf19621cad415103d25759105dbca67a461 /indra/media_plugins
parentd49e5bcbe26a4b148ce1d20a60d16581f41134c0 (diff)
parentc788986c9ed282f5e8afc8b5352e61986cdbc209 (diff)
automated merge viewer2.0->viewer2.0
Diffstat (limited to 'indra/media_plugins')
-rw-r--r--indra/media_plugins/quicktime/media_plugin_quicktime.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/media_plugins/quicktime/media_plugin_quicktime.cpp b/indra/media_plugins/quicktime/media_plugin_quicktime.cpp
index dbc44c8334..e230fcc280 100644
--- a/indra/media_plugins/quicktime/media_plugin_quicktime.cpp
+++ b/indra/media_plugins/quicktime/media_plugin_quicktime.cpp
@@ -724,8 +724,8 @@ private:
return false;
// allocate some space and grab it
- UInt8* item_data = new UInt8( size + 1 );
- memset( item_data, 0, ( size + 1 ) * sizeof( UInt8* ) );
+ UInt8* item_data = new UInt8[ size + 1 ];
+ memset( item_data, 0, ( size + 1 ) * sizeof( UInt8 ) );
result = QTMetaDataGetItemValue( media_data_ref, item, item_data, size, NULL );
if ( noErr != result )
{