Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(756)

Unified Diff: media/filters/ffmpeg_audio_decoder.h

Issue 2804042: Incomplete changes to make scoped_ptr_malloc use plain functions. (Closed)
Patch Set: chrome now builds & links Created 10 years, 5 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
« no previous file with comments | « media/ffmpeg/ffmpeg_common.h ('k') | media/filters/ffmpeg_video_decode_engine.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/filters/ffmpeg_audio_decoder.h
diff --git a/media/filters/ffmpeg_audio_decoder.h b/media/filters/ffmpeg_audio_decoder.h
index d0ad27f4ea63db78c2b612243f0295bd721fa457..c5fc59be76f96f3798c1e7fbd16707487e202569 100644
--- a/media/filters/ffmpeg_audio_decoder.h
+++ b/media/filters/ffmpeg_audio_decoder.h
@@ -13,7 +13,7 @@ struct AVCodecContext;
namespace media {
// Forward declaration for scoped_ptr_malloc.
-class ScopedPtrAVFree;
+void ScopedPtrAVFree(void*);
class FFmpegAudioDecoder : public DecoderBase<AudioDecoder, Buffer> {
public:
@@ -49,7 +49,7 @@ class FFmpegAudioDecoder : public DecoderBase<AudioDecoder, Buffer> {
// Data buffer to carry decoded raw PCM samples. This buffer is created by
// av_malloc() and is used throughout the lifetime of this class.
- scoped_ptr_malloc<uint8, ScopedPtrAVFree> output_buffer_;
+ scoped_ptr_malloc<uint8, FreeFnAdapter<ScopedPtrAVFree> > output_buffer_;
static const size_t kOutputBufferSize;
« no previous file with comments | « media/ffmpeg/ffmpeg_common.h ('k') | media/filters/ffmpeg_video_decode_engine.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698