diff options
| author | John Koleszar <jkoleszar@google.com> | 2011-07-21 00:05:10 -0400 |
|---|---|---|
| committer | John Koleszar <jkoleszar@google.com> | 2011-07-21 00:05:10 -0400 |
| commit | ca60e0c2f9f7b70a576c28f20d84d77acc95f958 (patch) | |
| tree | 2aeb8ec7d8f95d6039edba2486d91da0d68f6d16 | |
| parent | 6907117175b2b1d913fc37877647c4e70d803a85 (diff) | |
| parent | 0afcc7697120e5197a03b8129dc9a4ed0de56a8e (diff) | |
| download | libvpx-ca60e0c2f9f7b70a576c28f20d84d77acc95f958.tar libvpx-ca60e0c2f9f7b70a576c28f20d84d77acc95f958.tar.gz libvpx-ca60e0c2f9f7b70a576c28f20d84d77acc95f958.tar.bz2 libvpx-ca60e0c2f9f7b70a576c28f20d84d77acc95f958.zip | |
Merge remote branch 'origin/master' into experimental
Change-Id: I9761428209518b7fcbde60e884c06754664c0c36
| -rw-r--r-- | vp8/vp8_cx_iface.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/vp8/vp8_cx_iface.c b/vp8/vp8_cx_iface.c index 75d8013d7..199678817 100644 --- a/vp8/vp8_cx_iface.c +++ b/vp8/vp8_cx_iface.c @@ -828,14 +828,17 @@ static vpx_codec_err_t vp8e_encode(vpx_codec_alg_priv_t *ctx, 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; 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]; |