diff options
| author | xhwang@chromium.org <xhwang@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-12 01:04:33 +0000 |
|---|---|---|
| committer | xhwang@chromium.org <xhwang@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-12 01:04:33 +0000 |
| commit | 37141711d11b09cef8405c4c2384549dad316fe9 (patch) | |
| tree | 82c6e743cb9b011d5e600069ebb42e4098b1ec81 /media/ffmpeg/ffmpeg_common.cc | |
| parent | 8f92ac14a5a83d336f97317a7292394f187d5c16 (diff) | |
| download | chromium_src-37141711d11b09cef8405c4c2384549dad316fe9.zip chromium_src-37141711d11b09cef8405c4c2384549dad316fe9.tar.gz chromium_src-37141711d11b09cef8405c4c2384549dad316fe9.tar.bz2 | |
Support encrypted audio stream in demuxer.
BUG=123421
TEST=updated media_unittest
Review URL: https://chromiumcodereview.appspot.com/11088047
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@161465 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/ffmpeg/ffmpeg_common.cc')
| -rw-r--r-- | media/ffmpeg/ffmpeg_common.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/media/ffmpeg/ffmpeg_common.cc b/media/ffmpeg/ffmpeg_common.cc index 00d91f5..973dc81 100644 --- a/media/ffmpeg/ffmpeg_common.cc +++ b/media/ffmpeg/ffmpeg_common.cc @@ -222,6 +222,7 @@ void AVCodecContextToAudioDecoderConfig( samples_per_second, codec_context->extradata, codec_context->extradata_size, + false, // Not encrypted. true); } @@ -291,7 +292,7 @@ void AVStreamToVideoDecoderConfig( PixelFormatToVideoFormat(stream->codec->pix_fmt), coded_size, visible_rect, natural_size, stream->codec->extradata, stream->codec->extradata_size, - false, + false, // Not encrypted. true); } |