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/x11grab.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/x11grab.c')
| -rw-r--r-- | libavformat/x11grab.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavformat/x11grab.c b/libavformat/x11grab.c index f3e5579fb8..231c43da7e 100644 --- a/libavformat/x11grab.c +++ b/libavformat/x11grab.c @@ -130,7 +130,7 @@ x11grab_read_header(AVFormatContext *s1, AVFormatParameters *ap) st = av_new_stream(s1, 0); if (!st) { - return -ENOMEM; + return AVERROR(ENOMEM); } av_set_pts_info(st, 64, 1, 1000000); /* 64 bits pts in us */ @@ -151,7 +151,7 @@ x11grab_read_header(AVFormatContext *s1, AVFormatParameters *ap) IPC_CREAT|0777); if (x11grab->shminfo.shmid == -1) { av_log(s1, AV_LOG_ERROR, "Fatal: Can't get shared memory!\n"); - return -ENOMEM; + return AVERROR(ENOMEM); } x11grab->shminfo.shmaddr = image->data = shmat(x11grab->shminfo.shmid, 0, 0); x11grab->shminfo.readOnly = False; |