Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(176)

Side by Side Diff: source/libvpx/vpx/src/vpx_encoder.c

Issue 232133009: libvpx: Pull from upstream (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/deps/third_party/libvpx/
Patch Set: Created 6 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « source/libvpx/vpx/src/svc_encodeframe.c ('k') | source/libvpx/vpx/svc_context.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (c) 2010 The WebM project authors. All Rights Reserved. 2 * Copyright (c) 2010 The WebM project authors. All Rights Reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 10
(...skipping 376 matching lines...) Expand 10 before | Expand all | Expand 10 after
387 387
388 388
389 const vpx_codec_cx_pkt_t *vpx_codec_pkt_list_get(struct vpx_codec_pkt_list *list , 389 const vpx_codec_cx_pkt_t *vpx_codec_pkt_list_get(struct vpx_codec_pkt_list *list ,
390 vpx_codec_iter_t *ite r) { 390 vpx_codec_iter_t *ite r) {
391 const vpx_codec_cx_pkt_t *pkt; 391 const vpx_codec_cx_pkt_t *pkt;
392 392
393 if (!(*iter)) { 393 if (!(*iter)) {
394 *iter = list->pkts; 394 *iter = list->pkts;
395 } 395 }
396 396
397 pkt = (const void *) * iter; 397 pkt = (const vpx_codec_cx_pkt_t *)*iter;
398 398
399 if ((size_t)(pkt - list->pkts) < list->cnt) 399 if ((size_t)(pkt - list->pkts) < list->cnt)
400 *iter = pkt + 1; 400 *iter = pkt + 1;
401 else 401 else
402 pkt = NULL; 402 pkt = NULL;
403 403
404 return pkt; 404 return pkt;
405 } 405 }
OLDNEW
« no previous file with comments | « source/libvpx/vpx/src/svc_encodeframe.c ('k') | source/libvpx/vpx/svc_context.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698