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

Side by Side Diff: source/libvpx/vpxdec.c

Issue 1124333011: libvpx: Pull from upstream (Closed) Base URL: https://chromium.googlesource.com/chromium/deps/libvpx.git@master
Patch Set: only update to last nights LKGR Created 5 years, 7 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
« no previous file with comments | « source/libvpx/vpx_scale/win32/scaleopt.c ('k') | source/libvpx/webmdec.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 1062 matching lines...) Expand 10 before | Expand all | Expand 10 after
1073 update_image_md5(img, planes, &md5_ctx); 1073 update_image_md5(img, planes, &md5_ctx);
1074 MD5Final(md5_digest, &md5_ctx); 1074 MD5Final(md5_digest, &md5_ctx);
1075 print_md5(md5_digest, outfile_name); 1075 print_md5(md5_digest, outfile_name);
1076 } else { 1076 } else {
1077 outfile = open_outfile(outfile_name); 1077 outfile = open_outfile(outfile_name);
1078 write_image_file(img, planes, outfile); 1078 write_image_file(img, planes, outfile);
1079 fclose(outfile); 1079 fclose(outfile);
1080 } 1080 }
1081 } 1081 }
1082 } 1082 }
1083
1084 if (stop_after && frame_in >= stop_after)
1085 break;
1086 } 1083 }
1087 1084
1088 if (summary || progress) { 1085 if (summary || progress) {
1089 show_progress(frame_in, frame_out, dx_time); 1086 show_progress(frame_in, frame_out, dx_time);
1090 fprintf(stderr, "\n"); 1087 fprintf(stderr, "\n");
1091 } 1088 }
1092 1089
1093 if (frames_corrupted) 1090 if (frames_corrupted)
1094 fprintf(stderr, "WARNING: %d frames corrupted.\n", frames_corrupted); 1091 fprintf(stderr, "WARNING: %d frames corrupted.\n", frames_corrupted);
1095 1092
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
1148 if (arg_match(&arg, &looparg, argi)) { 1145 if (arg_match(&arg, &looparg, argi)) {
1149 loops = arg_parse_uint(&arg); 1146 loops = arg_parse_uint(&arg);
1150 break; 1147 break;
1151 } 1148 }
1152 } 1149 }
1153 free(argv); 1150 free(argv);
1154 for (i = 0; !error && i < loops; i++) 1151 for (i = 0; !error && i < loops; i++)
1155 error = main_loop(argc, argv_); 1152 error = main_loop(argc, argv_);
1156 return error; 1153 return error;
1157 } 1154 }
OLDNEW
« no previous file with comments | « source/libvpx/vpx_scale/win32/scaleopt.c ('k') | source/libvpx/webmdec.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698