diff options
author | François Revol <revol@free.fr> | 2007-02-13 18:26:14 +0000 |
---|---|---|
committer | François Revol <revol@free.fr> | 2007-02-13 18:26:14 +0000 |
commit | 8fa36ae09dddb1b639b4df5d505c0dbcf4e916e4 (patch) | |
tree | 551ead2b59bdc4b1855fb60d6c2ce6a2c7787f15 /libavformat/framehook.c | |
parent | bcdf0d269748e2059ffa789033cd6e41739891fc (diff) | |
download | ffmpeg-8fa36ae09dddb1b639b4df5d505c0dbcf4e916e4.tar.gz |
This fixes error handling for BeOS, removing the need for some ifdefs.
AVERROR_ defines are moved to avcodec.h as they are needed in there as well. Feel free to move that to avutil/common.h.
Bumped up avcodec/format version numbers as though it's binary compatible we will want to rebuild apps as error values changed.
Please from now on use return AVERROR(EFOO) instead of the ugly return -EFOO in your code.
This also removes the need for berrno.h.
Originally committed as revision 7965 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat/framehook.c')
-rw-r--r-- | libavformat/framehook.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libavformat/framehook.c b/libavformat/framehook.c index e9a11af9ae..8f5ddd66f8 100644 --- a/libavformat/framehook.c +++ b/libavformat/framehook.c @@ -57,7 +57,7 @@ int frame_hook_add(int argc, char *argv[]) fhe = av_mallocz(sizeof(*fhe)); if (!fhe) { - return -ENOMEM; + return AVERROR(ENOMEM); } fhe->Configure = dlsym(loaded, "Configure"); @@ -66,18 +66,18 @@ int frame_hook_add(int argc, char *argv[]) if (!fhe->Process) { av_log(NULL, AV_LOG_ERROR, "Failed to find Process entrypoint in %s\n", argv[0]); - return -1; + return AVERROR(ENOENT); } if (!fhe->Configure && argc > 1) { av_log(NULL, AV_LOG_ERROR, "Failed to find Configure entrypoint in %s\n", argv[0]); - return -1; + return AVERROR(ENOENT); } if (argc > 1 || fhe->Configure) { if (fhe->Configure(&fhe->ctx, argc, argv)) { av_log(NULL, AV_LOG_ERROR, "Failed to Configure %s\n", argv[0]); - return -1; + return AVERROR(EINVAL); } } |