diff options
| -rw-r--r-- | AUTHORS | 1 | ||||
| -rw-r--r-- | media/ffmpeg/file_protocol.cc | 4 | ||||
| -rw-r--r-- | media/filters/ffmpeg_glue.cc | 4 |
3 files changed, 9 insertions, 0 deletions
@@ -78,3 +78,4 @@ Benjamin Jemlich <pcgod99@gmail.com> Ningxin Hu <ningxin.hu@intel.com> Jared Wein <weinjared@gmail.com> Mingmin Xie <melvinxie@gmail.com> +Michael Gilbert <floppymaster@gmail.com> 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; } |