Chromium Code Reviews| Index: webkit/media/crypto/ppapi/ffmpeg_cdm_video_decoder.cc |
| diff --git a/webkit/media/crypto/ppapi/ffmpeg_cdm_video_decoder.cc b/webkit/media/crypto/ppapi/ffmpeg_cdm_video_decoder.cc |
| index ebf482de359229cbf550c0c0bd0cf26aac5ee6d3..6b5ae0ba8bd8aad97dd8fcfd8ccf4e111ae263a7 100644 |
| --- a/webkit/media/crypto/ppapi/ffmpeg_cdm_video_decoder.cc |
| +++ b/webkit/media/crypto/ppapi/ffmpeg_cdm_video_decoder.cc |
| @@ -8,7 +8,6 @@ |
| #include "base/memory/scoped_ptr.h" |
| #include "media/base/buffers.h" |
| #include "media/base/limits.h" |
| -#include "media/ffmpeg/ffmpeg_common.h" |
| #include "webkit/media/crypto/ppapi/content_decryption_module.h" |
| // Include FFmpeg header files. |
| @@ -125,11 +124,6 @@ bool FFmpegCdmVideoDecoder::Initialize(const cdm::VideoDecoderConfig& config) { |
| return false; |
| } |
| - av_register_all(); |
| - |
| - // Release existing resources if necessary. |
| - ReleaseFFmpegResources(); |
|
ddorwin
2012/10/25 01:34:17
Do we not need this anymore? I don't see it being
Tom Finegan
2012/10/25 04:58:37
It's called in ~FFmpegCdmVideoDecoder() and Deinit
|
| - |
| // Initialize AVCodecContext structure. |
| codec_context_ = avcodec_alloc_context3(NULL); |
| CdmVideoDecoderConfigToAVCodecContext(config, codec_context_); |