Commit 9f5bb440 authored by Paul B Mahol's avatar Paul B Mahol

rawvideodec: make use of AV_OPT_TYPE_VIDEO_RATE

Signed-off-by: 's avatarPaul B Mahol <onemda@gmail.com>
parent 4c76600a
...@@ -29,7 +29,7 @@ typedef struct RawVideoDemuxerContext { ...@@ -29,7 +29,7 @@ typedef struct RawVideoDemuxerContext {
const AVClass *class; /**< Class for private options. */ const AVClass *class; /**< Class for private options. */
char *video_size; /**< String describing video size, set by a private option. */ char *video_size; /**< String describing video size, set by a private option. */
char *pixel_format; /**< Set by a private option. */ char *pixel_format; /**< Set by a private option. */
char *framerate; /**< String describing framerate, set by a private option. */ AVRational framerate; /**< AVRational describing framerate, set by a private option. */
} RawVideoDemuxerContext; } RawVideoDemuxerContext;
...@@ -38,7 +38,6 @@ static int rawvideo_read_header(AVFormatContext *ctx) ...@@ -38,7 +38,6 @@ static int rawvideo_read_header(AVFormatContext *ctx)
RawVideoDemuxerContext *s = ctx->priv_data; RawVideoDemuxerContext *s = ctx->priv_data;
int width = 0, height = 0, ret = 0; int width = 0, height = 0, ret = 0;
enum AVPixelFormat pix_fmt; enum AVPixelFormat pix_fmt;
AVRational framerate;
AVStream *st; AVStream *st;
st = avformat_new_stream(ctx, NULL); st = avformat_new_stream(ctx, NULL);
...@@ -61,13 +60,7 @@ static int rawvideo_read_header(AVFormatContext *ctx) ...@@ -61,13 +60,7 @@ static int rawvideo_read_header(AVFormatContext *ctx)
return AVERROR(EINVAL); return AVERROR(EINVAL);
} }
if ((ret = av_parse_video_rate(&framerate, s->framerate)) < 0) { avpriv_set_pts_info(st, 64, s->framerate.den, s->framerate.num);
av_log(ctx, AV_LOG_ERROR, "Could not parse framerate: %s.\n",
s->framerate);
return ret;
}
avpriv_set_pts_info(st, 64, framerate.den, framerate.num);
st->codec->width = width; st->codec->width = width;
st->codec->height = height; st->codec->height = height;
...@@ -105,7 +98,7 @@ static int rawvideo_read_packet(AVFormatContext *s, AVPacket *pkt) ...@@ -105,7 +98,7 @@ static int rawvideo_read_packet(AVFormatContext *s, AVPacket *pkt)
static const AVOption rawvideo_options[] = { static const AVOption rawvideo_options[] = {
{ "video_size", "set frame size", OFFSET(video_size), AV_OPT_TYPE_STRING, {.str = NULL}, 0, 0, DEC }, { "video_size", "set frame size", OFFSET(video_size), AV_OPT_TYPE_STRING, {.str = NULL}, 0, 0, DEC },
{ "pixel_format", "set pixel format", OFFSET(pixel_format), AV_OPT_TYPE_STRING, {.str = "yuv420p"}, 0, 0, DEC }, { "pixel_format", "set pixel format", OFFSET(pixel_format), AV_OPT_TYPE_STRING, {.str = "yuv420p"}, 0, 0, DEC },
{ "framerate", "set frame rate", OFFSET(framerate), AV_OPT_TYPE_STRING, {.str = "25"}, 0, 0, DEC }, { "framerate", "set frame rate", OFFSET(framerate), AV_OPT_TYPE_VIDEO_RATE, {.str = "25"}, 0, 0, DEC },
{ NULL }, { NULL },
}; };
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment