[FFmpeg-devel] [PATCH 1/5] rawdec: make use of AV_OPT_TYPE_VIDEO_RATE

[Stefano Sabatini]

On date Friday 2013-04-05 15:09:24 +0000, Paul B Mahol encoded:
> Signed-off-by: Paul B Mahol <onemda at gmail.com>
> ---
>  libavformat/rawdec.c | 10 ++--------
>  libavformat/rawdec.h |  2 +-
>  2 files changed, 3 insertions(+), 9 deletions(-)
> 
> diff --git a/libavformat/rawdec.c b/libavformat/rawdec.c
> index 07c2782..153cc7b 100644
> --- a/libavformat/rawdec.c
> +++ b/libavformat/rawdec.c
> @@ -70,7 +70,6 @@ int ff_raw_video_read_header(AVFormatContext *s)
>  {
>      AVStream *st;
>      FFRawVideoDemuxerContext *s1 = s->priv_data;
> -    AVRational framerate;
>      int ret = 0;
>  
>  
> @@ -84,12 +83,7 @@ int ff_raw_video_read_header(AVFormatContext *s)
>      st->codec->codec_id = s->iformat->raw_codec_id;
>      st->need_parsing = AVSTREAM_PARSE_FULL_RAW;
>  
> -    if ((ret = av_parse_video_rate(&framerate, s1->framerate)) < 0) {
> -        av_log(s, AV_LOG_ERROR, "Could not parse framerate: %s.\n", s1->framerate);
> -        goto fail;
> -    }
> -
> -    st->codec->time_base = av_inv_q(framerate);
> +    st->codec->time_base = av_inv_q(s1->framerate);
>      avpriv_set_pts_info(st, 64, 1, 1200000);
>  
>  fail:
> @@ -101,7 +95,7 @@ fail:
>  #define OFFSET(x) offsetof(FFRawVideoDemuxerContext, x)
>  #define DEC AV_OPT_FLAG_DECODING_PARAM
>  const AVOption ff_rawvideo_options[] = {
> -    { "framerate", "", OFFSET(framerate), AV_OPT_TYPE_STRING, {.str = "25"}, 0, 0, DEC},
> +    { "framerate", "", OFFSET(framerate), AV_OPT_TYPE_VIDEO_RATE, {.str = "25"}, 0, 0, DEC},
>      { NULL },
>  };
>  
> diff --git a/libavformat/rawdec.h b/libavformat/rawdec.h
> index d978295..e1a2822 100644
> --- a/libavformat/rawdec.h
> +++ b/libavformat/rawdec.h
> @@ -30,7 +30,7 @@ typedef struct FFRawVideoDemuxerContext {
>      const AVClass *class;     /**< Class for private options. */
>      char *video_size;         /**< String describing video size, 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;     /**< Framerate, set by a private option. */
>  } FFRawVideoDemuxerContext;
>  
>  extern const AVOption ff_rawvideo_options[];

LGTM.
-- 
FFmpeg = Fanciful and Fiendish Most Pitiful Earthshaking Guru