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

Unified Diff: media/filters/ffmpeg_demuxer.h

Issue 9015015: Take advantage of the new Pass() machinery on scoped_ptr{,_malloc}. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years 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/filters/ffmpeg_demuxer.h
diff --git a/media/filters/ffmpeg_demuxer.h b/media/filters/ffmpeg_demuxer.h
index 5db09b33e108797153e6eb725971476aa396dc25..ee80dae82cfb74244b5a0e38268707357dd497cb 100644
--- a/media/filters/ffmpeg_demuxer.h
+++ b/media/filters/ffmpeg_demuxer.h
@@ -33,6 +33,7 @@
#include "media/base/demuxer.h"
#include "media/base/pipeline.h"
#include "media/base/video_decoder_config.h"
+#include "media/ffmpeg/ffmpeg_common.h"
#include "media/filters/ffmpeg_glue.h"
// FFmpeg forward declarations.
@@ -57,8 +58,8 @@ class FFmpegDemuxerStream : public DemuxerStream {
// Safe to call on any thread.
bool HasPendingReads();
- // Enqueues and takes ownership over the given AVPacket.
- void EnqueuePacket(AVPacket* packet);
+ // Enqueues the given AVPacket.
+ void EnqueuePacket(scoped_ptr_malloc<AVPacket, ScopedPtrAVFreePacket> packet);
// Signals to empty the buffer queue and mark next packet as discontinuous.
void FlushBuffers();

Powered by Google App Engine
This is Rietveld 408576698