Removed custom FFmpegLock. Removed ffmpeg headers from third_party/ffmpeg/include.

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): Add wmapro.
 # TODO(ajwong): Determine if we want to statically link libz.
 
 {
   'target_defaults': {
     'conditions': [
@@ skipping 41 matching lines @@
   'conditions': [
     # This condition is for migrating from pre-built binaries to an in-tree
     # source build.  Most of these should be removed once FFmpeg is built on
     # mac and linux.  Windows will take more work.
     #
     # TODO(ajwong): Per the comment above, reduce this conditional's size and
     # determine if in-tree build in Windows is tractable.
     ['(OS!="linux" and OS!="freebsd" and OS!="openbsd" and OS!="solaris" and OS!="mac") or use_system_ffmpeg!=0', {
       'variables': {
         'target_for_binaries': 'ffmpeg_binaries',
-        'ffmpeg_include_root': 'include',
+        'ffmpeg_include_root': 'source/patched-ffmpeg-mt',
       },
     },{  # else OS=="linux"
       'variables': {
         'target_for_binaries': 'ffmpegsumo_nolink',
         'ffmpeg_include_root': 'source/patched-ffmpeg-mt',
         'conditions': [
           ['target_arch=="x64" or target_arch=="ia32"', {
             'ffmpeg_asm_lib': 1,
           }],
           ['target_arch=="arm"', {
@@ skipping 54 matching lines @@
             'source/patched-ffmpeg-mt/libavutil/mem.c',
             'source/patched-ffmpeg-mt/libavutil/pixdesc.c', # TODO(fbarchard): Review this file.
             'source/patched-ffmpeg-mt/libavutil/rational.c',
             # Config file for the OS and architecture.
             'source/config/<(ffmpeg_branding)/<(OS)/<(ffmpeg_config)/config.h',
             'source/config/libavutil/avconfig.h',
           ],
           'include_dirs': [
             'source/config/<(ffmpeg_branding)/<(OS)/<(ffmpeg_config)',
             'source/patched-ffmpeg-mt',
-            'source/config',
+            'source/config',
           ],
           'defines': [
             'HAVE_AV_CONFIG_H',
             '_POSIX_C_SOURCE=200112',
           ],
           'cflags': [
             '-fomit-frame-pointer',
           ],
           'conditions': [
             ['ffmpeg_branding=="Chrome" or ffmpeg_branding=="ChromeOS"', {
@@ skipping 488 matching lines @@
         'include/win/inttypes.h',
         'include/win/stdint.h',
 
         # Files needed for stub generation rules.
         '<@(sig_files)',
         '<(extra_header)'
       ],
       'hard_dependency': 1,
       'direct_dependent_settings': {
         'include_dirs': [
-          'include',
+          'source/patched-ffmpeg-mt',
+          'source/config',
         ],
       },
       'conditions': [
         ['OS=="win"',
           {
             'variables': {
               'outfile_type': 'windows_lib',
               'output_dir': '<(PRODUCT_DIR)/lib',
               'intermediate_dir': '<(INTERMEDIATE_DIR)',
             },
@@ skipping 45 matching lines @@
           }, {  # else OS!="win"
             'variables': {
               'outfile_type': 'posix_stubs',
               'stubs_filename_root': 'ffmpeg_stubs',
               'project_path': 'third_party/ffmpeg',
               'intermediate_dir': '<(INTERMEDIATE_DIR)',
               'output_root': '<(SHARED_INTERMEDIATE_DIR)/ffmpeg',
             },
             'type': '<(library)',
             'include_dirs': [
-              'include',
+              'source/patched-ffmpeg-mt',
+              'source/config',
               '<(output_root)',
               '../..',  # The chromium 'src' directory.
             ],
             'direct_dependent_settings': {
               'defines': [
                 '__STDC_CONSTANT_MACROS',  # FFmpeg uses INT64_C.
               ],
               'include_dirs': [
                 '<(output_root)',
                 '../..',  # The chromium 'src' directory.
@@ skipping 88 matching lines @@
       ],
     },
   ],
 }
 
 # Local Variables:
 # tab-width:2
 # indent-tabs-mode:nil
 # End:
 # vim: set expandtab tabstop=2 shiftwidth=2: