ffmpeg roll to new source that includes HE AAC...

third_party/ffmpeg/ffmpeg.gyp

 # Copyright (c) 2010 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-# TODO(fbarchard): Turn off --enable-memalign-hack for all but windows.
+# TODO(fbarchard): Add wmapro.
 # TODO(ajwong): Determine if we want to statically link libz.
 
-
-
 {
   'target_defaults': {
     'conditions': [
       ['OS!="linux" and OS!="freebsd" and OS!="openbsd" and OS!="solaris"', {
         'sources/': [['exclude', '/linux/']]
       }],
       ['OS!="mac"', {'sources/': [['exclude', '/mac/']]}],
       ['OS!="win"', {'sources/': [['exclude', '/win/']]}],
     ],
     'variables': {
@@ skipping 124 matching lines @@
           ],
           'cflags': [
             '-fomit-frame-pointer',
           ],
           'conditions': [
             ['ffmpeg_branding=="Chrome" or ffmpeg_branding=="ChromeOS"', {
               'sources': [
                 'source/patched-ffmpeg-mt/libavcodec/aac.c',
                 'source/patched-ffmpeg-mt/libavcodec/aac_ac3_parser.c',
                 'source/patched-ffmpeg-mt/libavcodec/aac_parser.c',
+                'source/patched-ffmpeg-mt/libavcodec/aacsbr.c', # TODO(fbarchard): Review this file.
                 'source/patched-ffmpeg-mt/libavcodec/aactab.c',
                 'source/patched-ffmpeg-mt/libavcodec/cabac.c',
                 'source/patched-ffmpeg-mt/libavcodec/error_resilience.c',
                 'source/patched-ffmpeg-mt/libavcodec/h264.c',
                 'source/patched-ffmpeg-mt/libavcodec/h264_cabac.c', # TODO(fbarchard): Review this file.
                 'source/patched-ffmpeg-mt/libavcodec/h264_cavlc.c', # TODO(fbarchard): Review this file.
                 'source/patched-ffmpeg-mt/libavcodec/h264_direct.c', # TODO(fbarchard): Review this file.
                 'source/patched-ffmpeg-mt/libavcodec/h264_loopfilter.c', # TODO(fbarchard): Review this file.
                 'source/patched-ffmpeg-mt/libavcodec/h264_mp4toannexb_bsf.c',
                 'source/patched-ffmpeg-mt/libavcodec/h264_parser.c',
                 'source/patched-ffmpeg-mt/libavcodec/h264_ps.c', # TODO(fbarchard): Review this file.
                 'source/patched-ffmpeg-mt/libavcodec/h264_refs.c', # TODO(fbarchard): Review this file.
                 'source/patched-ffmpeg-mt/libavcodec/h264_sei.c', # TODO(fbarchard): Review this file.
                 'source/patched-ffmpeg-mt/libavcodec/h264idct.c',
                 'source/patched-ffmpeg-mt/libavcodec/h264pred.c',
                 'source/patched-ffmpeg-mt/libavcodec/mpeg4audio.c',
                 'source/patched-ffmpeg-mt/libavcodec/mpegaudio.c',
                 'source/patched-ffmpeg-mt/libavcodec/mpegaudio_parser.c',
                 'source/patched-ffmpeg-mt/libavcodec/mpegaudiodata.c',
                 'source/patched-ffmpeg-mt/libavcodec/mpegaudiodec.c',
                 'source/patched-ffmpeg-mt/libavcodec/mpegaudiodecheader.c',
                 'source/patched-ffmpeg-mt/libavcodec/mpegvideo.c',
+                'source/patched-ffmpeg-mt/libavcodec/rdft.c', # TODO(fbarchard): Review this file.
                 'source/patched-ffmpeg-mt/libavformat/gxf.c', # TODO(fbarchard): Review this file.
                 'source/patched-ffmpeg-mt/libavformat/id3v2.c',
                 'source/patched-ffmpeg-mt/libavformat/isom.c',
                 'source/patched-ffmpeg-mt/libavformat/mov.c',
                 'source/patched-ffmpeg-mt/libavformat/mp3.c',
                 'source/patched-ffmpeg-mt/libavutil/intfloat_readwrite.c',
               ],
             }],  # ffmpeg_branding
             ['ffmpeg_branding=="ChromiumOS" or ffmpeg_branding=="ChromeOS"', {
               'sources': [
                 'source/patched-ffmpeg-mt/libavcodec/pcm.c',
                 'source/patched-ffmpeg-mt/libavformat/raw.c',
                 'source/patched-ffmpeg-mt/libavformat/wav.c',
               ],
             }],  # ffmpeg_branding
             ['ffmpeg_branding=="ChromeOS"', {
               'sources': [
-                'source/patched-ffmpeg-mt/libavcodec/aandcttab.c', # TODO(fbarchard): For mpeg4 bsf. Review this file.
-                'source/patched-ffmpeg-mt/libavcodec/error_resilience.c', # TODO(fbarchard): For mpeg4 bsf. Review this file.
-                'source/patched-ffmpeg-mt/libavcodec/faandct.c', # TODO(fbarchard): For mpeg4 bsf. Review this file.
+                'source/patched-ffmpeg-mt/libavcodec/aandcttab.c', # TODO(fbarchard): For mpeg4 bsf. Review this file.
+                'source/patched-ffmpeg-mt/libavcodec/error_resilience.c', # TODO(fbarchard): For mpeg4 bsf. Review this file.
+                'source/patched-ffmpeg-mt/libavcodec/faandct.c', # TODO(fbarchard): For mpeg4 bsf. Review this file.
                 'source/patched-ffmpeg-mt/libavcodec/h263.c',
                 'source/patched-ffmpeg-mt/libavcodec/h263_parser.c', # TODO(fbarchard): Review this file.
                 'source/patched-ffmpeg-mt/libavcodec/h263dec.c',
                 'source/patched-ffmpeg-mt/libavcodec/h264_mp4toannexb_bsf.c', # TODO(fbarchard): Review this file.
                 'source/patched-ffmpeg-mt/libavcodec/intrax8.c',
                 'source/patched-ffmpeg-mt/libavcodec/intrax8dsp.c',
                 'source/patched-ffmpeg-mt/libavcodec/ituh263dec.c', # TODO(fbarchard): Review this file.
-                'source/patched-ffmpeg-mt/libavcodec/ituh263enc.c', # TODO(fbarchard): For mpeg4 bsf. Review this file.
-                'source/patched-ffmpeg-mt/libavcodec/jfdctint.c', # TODO(fbarchard): For mpeg4 bsf. Review this file.
-                'source/patched-ffmpeg-mt/libavcodec/jfdctfst.c', # TODO(fbarchard): For mpeg4 bsf. Review this file.
-                'source/patched-ffmpeg-mt/libavcodec/motion_est.c', # TODO(fbarchard): For mpeg4 bsf. Review this file.
+                'source/patched-ffmpeg-mt/libavcodec/ituh263enc.c', # TODO(fbarchard): For mpeg4 bsf. Review this file.
+                'source/patched-ffmpeg-mt/libavcodec/jfdctint.c', # TODO(fbarchard): For mpeg4 bsf. Review this file.
+                'source/patched-ffmpeg-mt/libavcodec/jfdctfst.c', # TODO(fbarchard): For mpeg4 bsf. Review this file.
+                'source/patched-ffmpeg-mt/libavcodec/motion_est.c', # TODO(fbarchard): For mpeg4 bsf. Review this file.
                 'source/patched-ffmpeg-mt/libavcodec/mpeg4data.h', # TODO(fbarchard): Review this file.
                 'source/patched-ffmpeg-mt/libavcodec/mpeg4video.c', # TODO(fbarchard): Review this file.
                 'source/patched-ffmpeg-mt/libavcodec/mpeg4video.h', # TODO(fbarchard): Review this file.
                 'source/patched-ffmpeg-mt/libavcodec/mpeg4video_parser.c',
                 'source/patched-ffmpeg-mt/libavcodec/mpeg4video_es_bsf.c', # TODO(fbarchard): Review this file.
-                'source/patched-ffmpeg-mt/libavcodec/mpeg4videoenc.c', # TODO(fbarchard): For mpeg4 bsf. Review this file.
-                'source/patched-ffmpeg-mt/libavcodec/mpeg4videodec.c', # TODO(fbarchard): Review this file.
-                'source/patched-ffmpeg-mt/libavcodec/mpegvideo.c', # TODO(fbarchard): For mpeg4 bsf. Review this file.
-                'source/patched-ffmpeg-mt/libavcodec/mpegvideo_enc.c', # TODO(fbarchard): For mpeg4 bsf. Review this file.
+                'source/patched-ffmpeg-mt/libavcodec/mpeg4videoenc.c', # TODO(fbarchard): For mpeg4 bsf. Review this file.
+                'source/patched-ffmpeg-mt/libavcodec/mpeg4videodec.c', # TODO(fbarchard): Review this file.
+                'source/patched-ffmpeg-mt/libavcodec/mpegvideo.c', # TODO(fbarchard): For mpeg4 bsf. Review this file.
+                'source/patched-ffmpeg-mt/libavcodec/mpegvideo_enc.c', # TODO(fbarchard): For mpeg4 bsf. Review this file.
                 'source/patched-ffmpeg-mt/libavcodec/msmpeg4.c',
                 'source/patched-ffmpeg-mt/libavcodec/msmpeg4data.c',
-                'source/patched-ffmpeg-mt/libavcodec/ratecontrol.c', # TODO(fbarchard): For mpeg4 bsf. Review this file.
+                'source/patched-ffmpeg-mt/libavcodec/ratecontrol.c', # TODO(fbarchard): For mpeg4 bsf. Review this file.
                 'source/patched-ffmpeg-mt/libavcodec/vc1.c',
                 'source/patched-ffmpeg-mt/libavcodec/vc1data.c',
                 'source/patched-ffmpeg-mt/libavcodec/vc1dec.c', # TODO(fbarchard): Review this file.
                 '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/wmv2.c',
                 'source/patched-ffmpeg-mt/libavcodec/wmv2dec.c',
                 'source/patched-ffmpeg-mt/libavcodec/vc1_asftoannexg_bsf.c', # TODO(fbarchard): Review this file.
                 'source/patched-ffmpeg-mt/libavcodec/vc1_asftorcv_bsf.c', # TODO(fbarchard): Review this file.
@@ skipping 37 matching lines @@
               'dependencies': [
                 'make_ffmpeg_asm_lib',
               ],
               'sources': [
                 'source/patched-ffmpeg-mt/libavcodec/x86/vc1dsp_mmx.c',
               ],
             }],
             ['target_arch=="ia32"', {
               'cflags!': [
                 # Turn off valgrind build option that breaks ffmpeg builds.
-                # Allows config.h HAVE_EBP_AVAILABLE 1 and HAVE_EBX_AVAILABLE 1
+                # Allows config.h HAVE_EBP_AVAILABLE 1 and HAVE_EBX_AVAILABLE 1
                 '-fno-omit-frame-pointer',
               ],
             }],  # target_arch=="ia32"
             ['target_arch=="x64"', {
               # x64 requires PIC for shared libraries. This is opposite
               # of ia32 where due to a slew of inline assembly using ebx,
               # FFmpeg CANNOT be built with PIC.
               'defines': [
                 'PIC',
               ],
@@ skipping 523 matching lines @@
       ],
     },
   ],
 }
 
 # Local Variables:
 # tab-width:2
 # indent-tabs-mode:nil
 # End:
 # vim: set expandtab tabstop=2 shiftwidth=2: