summaryrefslogtreecommitdiffstats
path: root/third_party/ffmpeg/ffmpeg.gyp
diff options
context:
space:
mode:
authorfbarchard@chromium.org <fbarchard@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-23 04:47:19 +0000
committerfbarchard@chromium.org <fbarchard@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-23 04:47:19 +0000
commitdab0ff55b8202a1b70acb1a9670b6976f0ec11f2 (patch)
tree2f82687c97df1d6e34627398c6a53ffa541773af /third_party/ffmpeg/ffmpeg.gyp
parent1e85748038a7f767719ee4a62fd2e8051beffbc2 (diff)
downloadchromium_src-dab0ff55b8202a1b70acb1a9670b6976f0ec11f2.zip
chromium_src-dab0ff55b8202a1b70acb1a9670b6976f0ec11f2.tar.gz
chromium_src-dab0ff55b8202a1b70acb1a9670b6976f0ec11f2.tar.bz2
ffmpeg enable wmapro
BUG=38321 TEST=make a wmapro using windows media encoder, and play it with chromeos Review URL: http://codereview.chromium.org/1107014 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@42314 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party/ffmpeg/ffmpeg.gyp')
-rw-r--r--third_party/ffmpeg/ffmpeg.gyp2
1 files changed, 1 insertions, 1 deletions
diff --git a/third_party/ffmpeg/ffmpeg.gyp b/third_party/ffmpeg/ffmpeg.gyp
index e16dd90..068a1b3 100644
--- a/third_party/ffmpeg/ffmpeg.gyp
+++ b/third_party/ffmpeg/ffmpeg.gyp
@@ -2,7 +2,6 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
-# TODO(fbarchard): Add wmapro.
# TODO(ajwong): Determine if we want to statically link libz.
{
@@ -223,6 +222,7 @@
'source/patched-ffmpeg-mt/libavcodec/vc1dsp.c',
'source/patched-ffmpeg-mt/libavcodec/wma.c',
'source/patched-ffmpeg-mt/libavcodec/wmadec.c',
+ 'source/patched-ffmpeg-mt/libavcodec/wmaprodec.c', # TODO(fbarchard): Review this file.
'source/patched-ffmpeg-mt/libavcodec/wmv2.c',
'source/patched-ffmpeg-mt/libavcodec/wmv2dec.c',
'source/patched-ffmpeg-mt/libavcodec/vc1_asftoannexg_bsf.c', # TODO(fbarchard): Review this file.