Move talk/media to webrtc/media

talk/app/webrtc/videosource.h

 /*
  * libjingle
  * Copyright 2012 Google Inc.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
  *
  *  1. Redistributions of source code must retain the above copyright notice,
  *     this list of conditions and the following disclaimer.
  *  2. Redistributions in binary form must reproduce the above copyright notice,
@@ skipping 16 matching lines @@
 
 #ifndef TALK_APP_WEBRTC_VIDEOSOURCE_H_
 #define TALK_APP_WEBRTC_VIDEOSOURCE_H_
 
 #include <list>
 
 #include "talk/app/webrtc/mediastreaminterface.h"
 #include "talk/app/webrtc/notifier.h"
 #include "talk/app/webrtc/videosourceinterface.h"
 #include "talk/app/webrtc/videotrackrenderers.h"
-#include "talk/media/base/videocapturer.h"
-#include "talk/media/base/videocommon.h"
 #include "webrtc/base/scoped_ptr.h"
 #include "webrtc/base/sigslot.h"
+#include "webrtc/media/base/videocapturer.h"
+#include "webrtc/media/base/videocommon.h"
 
 // VideoSource implements VideoSourceInterface. It owns a
 // cricket::VideoCapturer and make sure the camera is started at a resolution
 // that honors the constraints.
 // The state is set depending on the result of starting the capturer.
 // If the constraint can't be met or the capturer fails to start, the state
 // transition to kEnded, otherwise it transitions to kLive.
 
 namespace cricket {
 
@@ skipping 56 matching lines @@
 
   cricket::VideoFormat format_;
   cricket::VideoOptions options_;
   SourceState state_;
   const bool remote_;
 };
 
 }  // namespace webrtc
 
 #endif  // TALK_APP_WEBRTC_VIDEOSOURCE_H_