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

Unified Diff: media/filters/in_memory_url_protocol.h

Issue 10912080: Switch to AVIO instead of a custom FFmpeg URLProtocol handler. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: AVIO! Created 8 years, 3 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
Index: media/filters/in_memory_url_protocol.h
diff --git a/media/filters/in_memory_url_protocol.h b/media/filters/in_memory_url_protocol.h
index d8fca033723f2195f5ff1f0380e8511e7e32a488..5c323c1bc3c5114512e9b84d6fa3cb811c71d10c 100644
--- a/media/filters/in_memory_url_protocol.h
+++ b/media/filters/in_memory_url_protocol.h
@@ -6,6 +6,7 @@
#define MEDIA_FILTERS_IN_MEMORY_URL_PROTOCOL_H_
#include "base/basictypes.h"
+#include "base/compiler_specific.h"
#include "media/filters/ffmpeg_glue.h"
namespace media {
@@ -21,7 +22,7 @@ class MEDIA_EXPORT InMemoryUrlProtocol : public FFmpegURLProtocol {
virtual ~InMemoryUrlProtocol();
// FFmpegURLProtocol methods.
- virtual size_t Read(size_t size, uint8* data) OVERRIDE;
+ virtual int Read(int size, uint8* data) OVERRIDE;
virtual bool GetPosition(int64* position_out) OVERRIDE;
virtual bool SetPosition(int64 position) OVERRIDE;
virtual bool GetSize(int64* size_out) OVERRIDE;

Powered by Google App Engine
This is Rietveld 408576698