Revert "Chromium changes to statically link ffmpeg."

media/media_nacl.gyp

 # Copyright (c) 2012 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.
 
 {
   'variables': {
     'chromium_code': 1,
   },
   'includes': [
     '../native_client/build/untrusted.gypi',
@@ skipping 35 matching lines @@
           'type': 'none',
           'variables': {
             'nlib_target': 'libmedia_yuv_nacl.a',
             'build_glibc': 0,
             'build_newlib': 0,
             'build_pnacl_newlib': 1,
           },
           'sources': [
             'base/media.cc',
             'base/media.h',
+            'base/media_stub.cc',
             'base/simd/convert_rgb_to_yuv.h',
             'base/simd/convert_rgb_to_yuv_c.cc',
             'base/simd/convert_yuv_to_rgb.h',
             'base/simd/convert_yuv_to_rgb_c.cc',
             'base/simd/filter_yuv.h',
             'base/simd/filter_yuv_c.cc',
             'base/yuv_convert.cc',
             'base/yuv_convert.h',
           ],
-          'defines': [
-            'MEDIA_DISABLE_FFMPEG',
-          ],
         },  # end of target 'media_yuv_nacl'
       ],
     }],
   ],
 }