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

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

Issue 12807010: libvpx: Fix pull from upstream (Closed) Base URL: https://src.chromium.org/chrome/trunk/deps/third_party/libvpx/
Patch Set: Created 7 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
« no previous file with comments | « source/libvpx/vp8/vp8_dx_iface.c ('k') | no next file » | 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 71 matching lines...) Expand 10 before | Expand all | Expand 10 after
82 82
83 static size_t wrap_fwrite(const void *ptr, size_t size, size_t nmemb, 83 static size_t wrap_fwrite(const void *ptr, size_t size, size_t nmemb,
84 FILE *stream) { 84 FILE *stream) {
85 return fwrite(ptr, size, nmemb, stream); 85 return fwrite(ptr, size, nmemb, stream);
86 } 86 }
87 #define fwrite wrap_fwrite 87 #define fwrite wrap_fwrite
88 88
89 89
90 static const char *exec_name; 90 static const char *exec_name;
91 91
92 #define VP8_FOURCC (0x00385056) 92 #define VP8_FOURCC (0x30385056)
93 #define VP9_FOURCC (0x00395056) 93 #define VP9_FOURCC (0x30395056)
94 static const struct codec_item { 94 static const struct codec_item {
95 char const *name; 95 char const *name;
96 const vpx_codec_iface_t *(*iface)(void); 96 const vpx_codec_iface_t *(*iface)(void);
97 const vpx_codec_iface_t *(*dx_iface)(void); 97 const vpx_codec_iface_t *(*dx_iface)(void);
98 unsigned int fourcc; 98 unsigned int fourcc;
99 } codecs[] = { 99 } codecs[] = {
100 #if CONFIG_VP8_ENCODER && CONFIG_VP8_DECODER 100 #if CONFIG_VP8_ENCODER && CONFIG_VP8_DECODER
101 {"vp8", &vpx_codec_vp8_cx, &vpx_codec_vp8_dx, VP8_FOURCC}, 101 {"vp8", &vpx_codec_vp8_cx, &vpx_codec_vp8_dx, VP8_FOURCC},
102 #elif CONFIG_VP8_ENCODER && !CONFIG_VP8_DECODER 102 #elif CONFIG_VP8_ENCODER && !CONFIG_VP8_DECODER
103 {"vp8", &vpx_codec_vp8_cx, NULL, VP8_FOURCC}, 103 {"vp8", &vpx_codec_vp8_cx, NULL, VP8_FOURCC},
(...skipping 2625 matching lines...) Expand 10 before | Expand all | Expand 10 after
2729 } 2729 }
2730 fclose(f); 2730 fclose(f);
2731 }); 2731 });
2732 #endif 2732 #endif
2733 2733
2734 vpx_img_free(&raw); 2734 vpx_img_free(&raw);
2735 free(argv); 2735 free(argv);
2736 free(streams); 2736 free(streams);
2737 return res ? EXIT_FAILURE : EXIT_SUCCESS; 2737 return res ? EXIT_FAILURE : EXIT_SUCCESS;
2738 } 2738 }
OLDNEW
« no previous file with comments | « source/libvpx/vp8/vp8_dx_iface.c ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698