diff --git a/AUTHORS b/AUTHORS index cc26763f9233..9ac80497f5e4 100644 --- a/AUTHORS +++ b/AUTHORS @@ -78,3 +78,4 @@ Benjamin Jemlich Ningxin Hu Jared Wein Mingmin Xie +Michael Gilbert diff --git a/media/ffmpeg/file_protocol.cc b/media/ffmpeg/file_protocol.cc index 3acca44c1174..d70a3dcf7353 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 e35d96e9c0b1..cf06f35c7ce1 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; }