summaryrefslogtreecommitdiff
path: root/vpx
diff options
context:
space:
mode:
authorJohn Koleszar <jkoleszar@google.com>2011-03-15 00:05:07 -0400
committerJohn Koleszar <jkoleszar@google.com>2011-03-15 00:05:07 -0400
commitb210797a6ada5816a56cacb0b4106a5bf525314c (patch)
treef6a19e82285b78c105f7a7a05338a1e07eb65966 /vpx
parent23c4cbdfbae53661877d449072241651b788d016 (diff)
parent8c48c943e7c082b4330061e74ce85547253de301 (diff)
downloadlibvpx-b210797a6ada5816a56cacb0b4106a5bf525314c.tar
libvpx-b210797a6ada5816a56cacb0b4106a5bf525314c.tar.gz
libvpx-b210797a6ada5816a56cacb0b4106a5bf525314c.tar.bz2
libvpx-b210797a6ada5816a56cacb0b4106a5bf525314c.zip
Merge remote branch 'internal/upstream' into HEAD
Diffstat (limited to 'vpx')
-rw-r--r--vpx/internal/vpx_codec_internal.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/vpx/internal/vpx_codec_internal.h b/vpx/internal/vpx_codec_internal.h
index 470ea7344..a1ff1921e 100644
--- a/vpx/internal/vpx_codec_internal.h
+++ b/vpx/internal/vpx_codec_internal.h
@@ -332,7 +332,7 @@ typedef struct vpx_codec_priv_cb_pair
* extended in one of two ways. First, a second, algorithm specific structure
* can be allocated and the priv member pointed to it. Alternatively, this
* structure can be made the first member of the algorithm specific structure,
- * and the pointer casted to the proper type.
+ * and the pointer cast to the proper type.
*/
struct vpx_codec_priv
{