media/ffmpeg/ffmpeg_common_unittest.cc - Issue 1786733004: Revert of media config: expand is_encrypted to a struct.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: media/ffmpeg/ffmpeg_common_unittest.cc

Issue 1786733004: Revert of media config: expand is_encrypted to a struct. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 9 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

Index: media/ffmpeg/ffmpeg_common_unittest.cc

diff --git a/media/ffmpeg/ffmpeg_common_unittest.cc b/media/ffmpeg/ffmpeg_common_unittest.cc

index 0650ee65c5b2c62fdd59d4fc1b862d97c761fdd6..1d3340585614d825d34a331e0dc55bfef6c98e50 100644

--- a/media/ffmpeg/ffmpeg_common_unittest.cc

+++ b/media/ffmpeg/ffmpeg_common_unittest.cc

@@ -14,7 +14,6 @@

#include "base/memory/scoped_ptr.h"

#include "media/base/audio_decoder_config.h"

#include "media/base/media.h"

-#include "media/base/media_util.h"

#include "media/base/test_data_util.h"

#include "media/base/video_decoder_config.h"

#include "media/ffmpeg/ffmpeg_common.h"

@@ -135,7 +134,7 @@

context.sample_rate = 44100;

AudioDecoderConfig decoder_config;

- ASSERT_TRUE(AVCodecContextToAudioDecoderConfig(&context, Unencrypted(),

+ ASSERT_TRUE(AVCodecContextToAudioDecoderConfig(&context, false,

&decoder_config));

EXPECT_EQ(48000, decoder_config.samples_per_second());

}

« no previous file with comments | « media/ffmpeg/ffmpeg_common.cc ('k') | media/filters/audio_decoder_selector_unittest.cc » ('j') | no next file with comments »