diff options
| author | fbarchard@chromium.org <fbarchard@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-08 02:28:24 +0000 |
|---|---|---|
| committer | fbarchard@chromium.org <fbarchard@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-08 02:28:24 +0000 |
| commit | 084283d38f39c3c6cff4665779a2e8d3c2c58b99 (patch) | |
| tree | de1a7121d7c6f9faee03eddf5df3a253a130aab9 /media | |
| parent | 8be9ff2f63bd4f97c23eb88e757da07543333e64 (diff) | |
| download | chromium_src-084283d38f39c3c6cff4665779a2e8d3c2c58b99.zip chromium_src-084283d38f39c3c6cff4665779a2e8d3c2c58b99.tar.gz chromium_src-084283d38f39c3c6cff4665779a2e8d3c2c58b99.tar.bz2 | |
Change prototype to match upstream change from ffmpeg trunk to fix build with system ffmpeg.
Declare the url_write buffer parameter as const
BUG=45821
TEST=Build with use_system_ffmpeg on and off (1/0).
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@49139 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media')
| -rw-r--r-- | media/ffmpeg/file_protocol.cc | 4 | ||||
| -rw-r--r-- | media/filters/ffmpeg_glue.cc | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/media/ffmpeg/file_protocol.cc b/media/ffmpeg/file_protocol.cc index 3acca44..d70a3dc 100644 --- a/media/ffmpeg/file_protocol.cc +++ b/media/ffmpeg/file_protocol.cc @@ -51,7 +51,11 @@ int ReadContext(URLContext* h, unsigned char* buf, int size) { return HANDLE_EINTR(read(GetHandle(h), buf, size)); } +#if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(52, 68, 0) +int WriteContext(URLContext* h, const unsigned char* buf, int size) { +#else int WriteContext(URLContext* h, unsigned char* buf, int size) { +#endif return HANDLE_EINTR(write(GetHandle(h), buf, size)); } diff --git a/media/filters/ffmpeg_glue.cc b/media/filters/ffmpeg_glue.cc index e35d96e..cf06f35 100644 --- a/media/filters/ffmpeg_glue.cc +++ b/media/filters/ffmpeg_glue.cc @@ -34,7 +34,11 @@ int ReadContext(URLContext* h, unsigned char* buf, int size) { return result; } +#if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(52, 68, 0) +int WriteContext(URLContext* h, const unsigned char* buf, int size) { +#else int WriteContext(URLContext* h, unsigned char* buf, int size) { +#endif // We don't support writing. return AVERROR_IO; } |