ref: a53586d9d1dfcdf49b418a453f2d69dd230b9088
parent: 8f01c2d78481b9fb081dd85894d95d2756a34886
parent: 0afcc7697120e5197a03b8129dc9a4ed0de56a8e
author: John Koleszar <jkoleszar@google.com>
date: Wed Jul 20 20:05:05 EDT 2011
Merge remote branch 'internal/upstream' into HEAD
--- a/vp8/vp8_cx_iface.c
+++ b/vp8/vp8_cx_iface.c
@@ -828,6 +828,9 @@
int i;
const int num_partitions =
(1 << cpi->common.multi_token_partition) + 1;
+
+ pkt.data.frame.flags |= VPX_FRAME_IS_FRAGMENT;
+
for (i = 0; i < num_partitions; ++i)
{
pkt.data.frame.buf = cx_data;
@@ -834,8 +837,8 @@
pkt.data.frame.sz = cpi->partition_sz[i];
pkt.data.frame.partition_id = i;
/* don't set the fragment bit for the last partition */
- if (i < num_partitions - 1)
- pkt.data.frame.flags |= VPX_FRAME_IS_FRAGMENT;
+ if (i == (num_partitions - 1))
+ pkt.data.frame.flags &= ~VPX_FRAME_IS_FRAGMENT;
vpx_codec_pkt_list_add(&ctx->pkt_list.head, &pkt);
cx_data += cpi->partition_sz[i];
cx_data_sz -= cpi->partition_sz[i];