Refactor some code that depends on FFmpeg

media/media.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.
 
 {
   'variables': {
     'chromium_code': 1,
   },
   'target_defaults': {
     'conditions': [
@@ skipping 69 matching lines @@
         'base/synchronizer.cc',
         'base/synchronizer.h',
         'base/video_frame_impl.cc',
         'base/video_frame_impl.h',
         'base/yuv_convert.cc',
         'base/yuv_convert.h',
         'base/yuv_row_win.cc',
         'base/yuv_row_mac.cc',
         'base/yuv_row_linux.cc',
         'base/yuv_row.h',
+        'ffmpeg/ffmpeg_common.cc',
+        'ffmpeg/ffmpeg_common.h',
         'ffmpeg/ffmpeg_util.cc',
         'ffmpeg/ffmpeg_util.h',
+        'ffmpeg/file_protocol.cc',
+        'ffmpeg/file_protocol.h',
         'filters/audio_renderer_algorithm_base.cc',
         'filters/audio_renderer_algorithm_base.h',
         'filters/audio_renderer_algorithm_default.cc',
         'filters/audio_renderer_algorithm_default.h',
         'filters/audio_renderer_algorithm_ola.cc',
         'filters/audio_renderer_algorithm_ola.h',
         'filters/audio_renderer_base.cc',
         'filters/audio_renderer_base.h',
         'filters/audio_renderer_impl.cc',
         'filters/audio_renderer_impl.h',
         'filters/bitstream_converter.cc',
         'filters/bitstream_converter.h',
         'filters/decoder_base.h',
         'filters/ffmpeg_audio_decoder.cc',
         'filters/ffmpeg_audio_decoder.h',
-        'filters/ffmpeg_common.cc',
-        'filters/ffmpeg_common.h',
         'filters/ffmpeg_demuxer.cc',
         'filters/ffmpeg_demuxer.h',
         'filters/ffmpeg_glue.cc',
         'filters/ffmpeg_glue.h',
         'filters/ffmpeg_interfaces.cc',
         'filters/ffmpeg_interfaces.h',
         'filters/ffmpeg_video_decode_engine.cc',
         'filters/ffmpeg_video_decode_engine.h',
         'filters/ffmpeg_video_decoder.cc',
         'filters/ffmpeg_video_decoder.h',
@@ skipping 117 matching lines @@
     {
       'target_name': 'media_bench',
       'type': 'executable',
       'msvs_guid': '45BC4F87-4604-4962-A751-7C7B29A080BF',
       'dependencies': [
         'media',
         '../base/base.gyp:base',
         '../third_party/ffmpeg/ffmpeg.gyp:ffmpeg',
       ],
       'sources': [
-        'tools/media_bench/file_protocol.cc',
-        'tools/media_bench/file_protocol.h',
         'tools/media_bench/media_bench.cc',
       ],
     },
     {
       'target_name': 'wav_ola_test',
       'type': 'executable',
       'dependencies': [
         'media',
       ],
       'sources': [
         'tools/wav_ola_test/wav_ola_test.cc'
       ],
     },
     {
       'target_name': 'qt_faststart',
       'type': 'executable',
       'sources': [
         'tools/qt_faststart/qt_faststart.c'
       ],
     },
     {
       'target_name': 'omx_test',
       'type': 'executable',
       'dependencies': [
         'omx_wrapper',
         '../base/base.gyp:base',
       ],
       'sources': [
-        'omx/omx_test.cc',
+        'tools/omx_test/omx_test.cc',
       ],
     },
     {
       'target_name': 'omx_unittests',
       'type': 'executable',
       'dependencies': [
         'omx_wrapper',
         '../base/base.gyp:base',
         '../base/base.gyp:base_i18n',
         '../testing/gtest.gyp:gtest',
@@ skipping 85 matching lines @@
       ],
     }],
   ],
 }
 
 # Local Variables:
 # tab-width:2
 # indent-tabs-mode:nil
 # End:
 # vim: set expandtab tabstop=2 shiftwidth=2: