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/grab_bktr.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/grab_bktr.c')
| -rw-r--r-- | libavformat/grab_bktr.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavformat/grab_bktr.c b/libavformat/grab_bktr.c index eea221cdd6..86348af5b1 100644 --- a/libavformat/grab_bktr.c +++ b/libavformat/grab_bktr.c @@ -225,7 +225,7 @@ static int grab_read_packet(AVFormatContext *s1, AVPacket *pkt) VideoData *s = s1->priv_data; if (av_new_packet(pkt, video_buf_size) < 0) - return -EIO; + return AVERROR(EIO); bktr_getframe(s->per_frame); @@ -259,7 +259,7 @@ static int grab_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 use */ s->width = width; @@ -287,7 +287,7 @@ static int grab_read_header(AVFormatContext *s1, AVFormatParameters *ap) if (bktr_init(video_device, width, height, format, &(s->video_fd), &(s->tuner_fd), -1, 0.0) < 0) - return -EIO; + return AVERROR(EIO); nsignals = 0; last_frame_time = 0; |