| Index: media/tools/omx_test/omx_test.cc
|
| diff --git a/media/tools/omx_test/omx_test.cc b/media/tools/omx_test/omx_test.cc
|
| index 693c7be3272c43be8722baa9dcdeb9ce6b67b6ae..44b728fa82d86a5a0b7925536da35cf39595a2b3 100644
|
| --- a/media/tools/omx_test/omx_test.cc
|
| +++ b/media/tools/omx_test/omx_test.cc
|
| @@ -173,21 +173,21 @@ class TestApp : public base::RefCountedThreadSafe<TestApp>,
|
| media::VideoCodecConfig config;
|
| switch (av_stream_->codec->codec_id) {
|
| case CODEC_ID_VC1:
|
| - config.codec_ = media::kCodecVC1; break;
|
| + config.codec = media::kCodecVC1; break;
|
| case CODEC_ID_H264:
|
| - config.codec_ = media::kCodecH264; break;
|
| + config.codec = media::kCodecH264; break;
|
| case CODEC_ID_THEORA:
|
| - config.codec_ = media::kCodecTheora; break;
|
| + config.codec = media::kCodecTheora; break;
|
| case CODEC_ID_MPEG2VIDEO:
|
| - config.codec_ = media::kCodecMPEG2; break;
|
| + config.codec = media::kCodecMPEG2; break;
|
| case CODEC_ID_MPEG4:
|
| - config.codec_ = media::kCodecMPEG4; break;
|
| + config.codec = media::kCodecMPEG4; break;
|
| default:
|
| NOTREACHED(); break;
|
| }
|
| - config.opaque_context_ = NULL;
|
| - config.width_ = av_stream_->codec->width;
|
| - config.height_ = av_stream_->codec->height;
|
| + config.opaque_context = NULL;
|
| + config.width = av_stream_->codec->width;
|
| + config.height = av_stream_->codec->height;
|
| engine_.reset(new OmxVideoDecodeEngine());
|
| engine_->Initialize(&message_loop_, this, config);
|
|
|
|
|