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

Side by Side Diff: third_party/ffmpeg/ffmpeg.gyp

Issue 1133006: Roll deps to pick up ffmpeg fix from r42082 and fix a missing file in ffmpeg.... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 10 years, 9 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 | « DEPS ('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 # Copyright (c) 2010 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2010 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 # TODO(fbarchard): Add wmapro. 5 # TODO(fbarchard): Add wmapro.
6 # TODO(ajwong): Determine if we want to statically link libz. 6 # TODO(ajwong): Determine if we want to statically link libz.
7 7
8 { 8 {
9 'target_defaults': { 9 'target_defaults': {
10 'conditions': [ 10 'conditions': [
(...skipping 89 matching lines...) Expand 10 before | Expand all | Expand 10 after
100 'source/patched-ffmpeg-mt/libavcodec/raw.c', 100 'source/patched-ffmpeg-mt/libavcodec/raw.c',
101 'source/patched-ffmpeg-mt/libavcodec/simple_idct.c', 101 'source/patched-ffmpeg-mt/libavcodec/simple_idct.c',
102 'source/patched-ffmpeg-mt/libavcodec/utils.c', 102 'source/patched-ffmpeg-mt/libavcodec/utils.c',
103 'source/patched-ffmpeg-mt/libavcodec/vorbis.c', 103 'source/patched-ffmpeg-mt/libavcodec/vorbis.c',
104 'source/patched-ffmpeg-mt/libavcodec/vorbis_data.c', 104 'source/patched-ffmpeg-mt/libavcodec/vorbis_data.c',
105 'source/patched-ffmpeg-mt/libavcodec/vorbis_dec.c', 105 'source/patched-ffmpeg-mt/libavcodec/vorbis_dec.c',
106 'source/patched-ffmpeg-mt/libavcodec/vp3.c', 106 'source/patched-ffmpeg-mt/libavcodec/vp3.c',
107 'source/patched-ffmpeg-mt/libavcodec/vp3dsp.c', 107 'source/patched-ffmpeg-mt/libavcodec/vp3dsp.c',
108 'source/patched-ffmpeg-mt/libavcodec/xiph.c', 108 'source/patched-ffmpeg-mt/libavcodec/xiph.c',
109 'source/patched-ffmpeg-mt/libavformat/allformats.c', 109 'source/patched-ffmpeg-mt/libavformat/allformats.c',
110 'source/patched-ffmpeg-mt/libavformat/avi.c',
110 'source/patched-ffmpeg-mt/libavformat/avio.c', 111 'source/patched-ffmpeg-mt/libavformat/avio.c',
111 'source/patched-ffmpeg-mt/libavformat/aviobuf.c', 112 'source/patched-ffmpeg-mt/libavformat/aviobuf.c',
112 'source/patched-ffmpeg-mt/libavformat/cutils.c', 113 'source/patched-ffmpeg-mt/libavformat/cutils.c',
113 'source/patched-ffmpeg-mt/libavformat/id3v1.c', # TODO(fbarchard): R eview this file. 114 'source/patched-ffmpeg-mt/libavformat/id3v1.c', # TODO(fbarchard): R eview this file.
114 'source/patched-ffmpeg-mt/libavformat/metadata.c', 115 'source/patched-ffmpeg-mt/libavformat/metadata.c',
115 'source/patched-ffmpeg-mt/libavformat/metadata_compat.c', 116 'source/patched-ffmpeg-mt/libavformat/metadata_compat.c',
116 'source/patched-ffmpeg-mt/libavformat/oggdec.c', 117 'source/patched-ffmpeg-mt/libavformat/oggdec.c',
117 'source/patched-ffmpeg-mt/libavformat/oggparseogm.c', 118 'source/patched-ffmpeg-mt/libavformat/oggparseogm.c',
118 'source/patched-ffmpeg-mt/libavformat/oggparsetheora.c', 119 'source/patched-ffmpeg-mt/libavformat/oggparsetheora.c',
119 'source/patched-ffmpeg-mt/libavformat/oggparsevorbis.c', 120 'source/patched-ffmpeg-mt/libavformat/oggparsevorbis.c',
(...skipping 691 matching lines...) Expand 10 before | Expand all | Expand 10 after
811 ], 812 ],
812 }, 813 },
813 ], 814 ],
814 } 815 }
815 816
816 # Local Variables: 817 # Local Variables:
817 # tab-width:2 818 # tab-width:2
818 # indent-tabs-mode:nil 819 # indent-tabs-mode:nil
819 # End: 820 # End:
820 # vim: set expandtab tabstop=2 shiftwidth=2: 821 # vim: set expandtab tabstop=2 shiftwidth=2:
OLDNEW
« no previous file with comments | « DEPS ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698