| Index: content/browser/media/media_browsertest.cc
|
| diff --git a/content/browser/media/media_browsertest.cc b/content/browser/media/media_browsertest.cc
|
| index ec70dcded5d29a338d5d80712d6fc1018ad2b26e..ccdd68808c93571d1d1af5435c5502ba031097ac 100644
|
| --- a/content/browser/media/media_browsertest.cc
|
| +++ b/content/browser/media/media_browsertest.cc
|
| @@ -123,10 +123,7 @@ IN_PROC_BROWSER_TEST_P(MediaTest, VideoBearAviMp3Mpeg4) {
|
| PlayVideo("bear_mpeg4_mp3.avi", GetParam());
|
| }
|
|
|
| -// TODO(scherkus): MPEG-4 ASP contains B-frames and out-of-order decoding, which
|
| -// makes FFmpeg spit out video frames with no timestamp. As a result we DCHECK()
|
| -// all over the place http://crbug.com/169570
|
| -IN_PROC_BROWSER_TEST_P(MediaTest, DISABLED_VideoBearAviMp3Mpeg4Asp) {
|
| +IN_PROC_BROWSER_TEST_P(MediaTest, VideoBearAviMp3Mpeg4Asp) {
|
| PlayVideo("bear_mpeg4asp_mp3.avi", GetParam());
|
| }
|
|
|
|
|