| Index: content/common/media/media_param_traits.h
|
| diff --git a/content/common/media/media_param_traits.h b/content/common/media/media_param_traits.h
|
| index f1696197febe1214bc33f26f9b6690e5828d0bda..94e2cd0970a8aa7c737af069b7288fceedd730c0 100644
|
| --- a/content/common/media/media_param_traits.h
|
| +++ b/content/common/media/media_param_traits.h
|
| @@ -11,7 +11,7 @@
|
|
|
| namespace media {
|
| class AudioParameters;
|
| -class VideoCaptureParams;
|
| +class VideoCaptureFormat;
|
| }
|
|
|
| namespace IPC {
|
| @@ -25,14 +25,13 @@ struct CONTENT_EXPORT ParamTraits<media::AudioParameters> {
|
| };
|
|
|
| template <>
|
| -struct CONTENT_EXPORT ParamTraits<media::VideoCaptureParams> {
|
| - typedef media::VideoCaptureParams param_type;
|
| +struct CONTENT_EXPORT ParamTraits<media::VideoCaptureFormat> {
|
| + typedef media::VideoCaptureFormat param_type;
|
| static void Write(Message* m, const param_type& p);
|
| static bool Read(const Message* m, PickleIterator* iter, param_type* r);
|
| static void Log(const param_type& p, std::string* l);
|
| };
|
|
|
| -
|
| } // namespace IPC
|
|
|
| #endif // CONTENT_COMMON_MEDIA_MEDIA_PARAM_TRAITS_H_
|
|
|