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

Unified Diff: media/filters/ffmpeg_glue.cc

Issue 6993042: ffmpeg chromium glue (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: once more new test_expectations.txt Created 9 years, 6 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
« no previous file with comments | « media/filters/ffmpeg_demuxer_unittest.cc ('k') | media/filters/ffmpeg_glue_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/filters/ffmpeg_glue.cc
===================================================================
--- media/filters/ffmpeg_glue.cc (revision 91170)
+++ media/filters/ffmpeg_glue.cc (working copy)
@@ -20,7 +20,7 @@
FFmpegURLProtocol* protocol;
FFmpegGlue::GetInstance()->GetProtocol(filename, &protocol);
if (!protocol)
- return AVERROR_IO;
+ return AVERROR(EIO);
h->priv_data = protocol;
h->flags = URL_RDONLY;
@@ -32,7 +32,7 @@
FFmpegURLProtocol* protocol = ToProtocol(h->priv_data);
int result = protocol->Read(size, buf);
if (result < 0)
- result = AVERROR_IO;
+ result = AVERROR(EIO);
return result;
}
@@ -42,12 +42,12 @@
static int WriteContext(URLContext* h, unsigned char* buf, int size) {
#endif
// We don't support writing.
- return AVERROR_IO;
+ return AVERROR(EIO);
}
static int64 SeekContext(URLContext* h, int64 offset, int whence) {
FFmpegURLProtocol* protocol = ToProtocol(h->priv_data);
- int64 new_offset = AVERROR_IO;
+ int64 new_offset = AVERROR(EIO);
switch (whence) {
case SEEK_SET:
if (protocol->SetPosition(offset))
@@ -78,7 +78,7 @@
NOTREACHED();
}
if (new_offset < 0)
- new_offset = AVERROR_IO;
+ new_offset = AVERROR(EIO);
return new_offset;
}
« no previous file with comments | « media/filters/ffmpeg_demuxer_unittest.cc ('k') | media/filters/ffmpeg_glue_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698