| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "webkit/media/crypto/ppapi/ffmpeg_cdm_video_decoder.h" | 5 #include "webkit/media/crypto/ppapi/ffmpeg_cdm_video_decoder.h" |
| 6 | 6 |
| 7 #include "base/logging.h" | 7 #include "base/logging.h" |
| 8 #include "base/memory/scoped_ptr.h" | 8 #include "base/memory/scoped_ptr.h" |
| 9 #include "media/base/buffers.h" | 9 #include "media/base/buffers.h" |
| 10 #include "media/base/limits.h" | 10 #include "media/base/limits.h" |
| 11 #include "webkit/media/crypto/ppapi/content_decryption_module.h" | 11 #include "webkit/media/crypto/ppapi/cdm/content_decryption_module.h" |
| 12 | 12 |
| 13 // Include FFmpeg header files. | 13 // Include FFmpeg header files. |
| 14 extern "C" { | 14 extern "C" { |
| 15 // Temporarily disable possible loss of data warning. | 15 // Temporarily disable possible loss of data warning. |
| 16 MSVC_PUSH_DISABLE_WARNING(4244); | 16 MSVC_PUSH_DISABLE_WARNING(4244); |
| 17 #include <libavcodec/avcodec.h> | 17 #include <libavcodec/avcodec.h> |
| 18 MSVC_POP_WARNING(); | 18 MSVC_POP_WARNING(); |
| 19 } // extern "C" | 19 } // extern "C" |
| 20 | 20 |
| 21 namespace webkit_media { | 21 namespace webkit_media { |
| (...skipping 314 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 336 av_free(codec_context_); | 336 av_free(codec_context_); |
| 337 codec_context_ = NULL; | 337 codec_context_ = NULL; |
| 338 } | 338 } |
| 339 if (av_frame_) { | 339 if (av_frame_) { |
| 340 av_free(av_frame_); | 340 av_free(av_frame_); |
| 341 av_frame_ = NULL; | 341 av_frame_ = NULL; |
| 342 } | 342 } |
| 343 } | 343 } |
| 344 | 344 |
| 345 } // namespace webkit_media | 345 } // namespace webkit_media |
| OLD | NEW |