comparison grab_bktr.c @ 1787:eb16c64144ee libavformat

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.

1786:8cc34fe98a3b

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;

    bktr_getframe(s->per_frame);

    pkt->pts = av_gettime();
    memcpy(pkt->data, video_buf, video_buf_size);

    if (!video_device)
        video_device = "/dev/bktr0";

    st = av_new_stream(s1, 0);
    if (!st)
        return -ENOMEM;
    av_set_pts_info(st, 64, 1, 1000000); /* 64 bits pts in use */

    s->width = width;
    s->height = height;
    s->frame_rate = frame_rate;

            format = NTSC;
    }

    if (bktr_init(video_device, width, height, format,
            &(s->video_fd), &(s->tuner_fd), -1, 0.0) < 0)
        return -EIO;

    nsignals = 0;
    last_frame_time = 0;

    return 0;

1787:eb16c64144ee

static int grab_read_packet(AVFormatContext *s1, AVPacket *pkt)
{
    VideoData *s = s1->priv_data;

    if (av_new_packet(pkt, video_buf_size) < 0)
        return AVERROR(EIO);

    bktr_getframe(s->per_frame);

    pkt->pts = av_gettime();
    memcpy(pkt->data, video_buf, video_buf_size);

    if (!video_device)
        video_device = "/dev/bktr0";

    st = av_new_stream(s1, 0);
    if (!st)
        return AVERROR(ENOMEM);
    av_set_pts_info(st, 64, 1, 1000000); /* 64 bits pts in use */

    s->width = width;
    s->height = height;
    s->frame_rate = frame_rate;

            format = NTSC;
    }

    if (bktr_init(video_device, width, height, format,
            &(s->video_fd), &(s->tuner_fd), -1, 0.0) < 0)
        return AVERROR(EIO);

    nsignals = 0;
    last_frame_time = 0;

    return 0;