Revert 42415 - Removed custom FFmpegLock. Removed ffmpeg headers from third_p...

third_party/ffmpeg/ffmpeg.gyp

Index: third_party/ffmpeg/ffmpeg.gyp
===================================================================
--- third_party/ffmpeg/ffmpeg.gyp	(revision 42420)
+++ third_party/ffmpeg/ffmpeg.gyp	(working copy)
@@ -58,7 +58,7 @@
     ['(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': 'source/patched-ffmpeg-mt',
+        'ffmpeg_include_root': 'include',
       },
     },{  # else OS=="linux"
       'variables': {
@@ -134,7 +134,7 @@
           'include_dirs': [
             'source/config/<(ffmpeg_branding)/<(OS)/<(ffmpeg_config)',
             'source/patched-ffmpeg-mt',
-            'source/config',
+	    'source/config',
           ],
           'defines': [
             'HAVE_AV_CONFIG_H',
@@ -644,8 +644,7 @@
       'hard_dependency': 1,
       'direct_dependent_settings': {
         'include_dirs': [
-          'source/patched-ffmpeg-mt',
-          'source/config',
+          'include',
         ],
       },
       'conditions': [
@@ -711,8 +710,7 @@
             },
             'type': '<(library)',
             'include_dirs': [
-              'source/patched-ffmpeg-mt',
-              'source/config',
+              'include',
               '<(output_root)',
               '../..',  # The chromium 'src' directory.
             ],