har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bktr: prefer "framerate" over "fps" for grab_read_header()

Browse Source 
The variable is used for containing the parsed value of s1->framerate,
using a lexically consistent name ease readability/understanding.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
This commit is contained in:
Stefano Sabatini 2011-06-03 10:54:10 +02:00 committed by Anton Khirnov
parent 147bcf27c4
commit da51a7c69c
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libavdevice/bktr.c
View File

@ -248,7 +248,7 @@ static int grab_read_header(AVFormatContext *s1, AVFormatParameters *ap)
VideoData *s = s1->priv_data; VideoData *s = s1->priv_data;
AVStream *st; AVStream *st;
int width, height; int width, height;
AVRational fps; AVRational framerate;
int ret = 0; int ret = 0;
#if FF_API_FORMAT_PARAMETERS #if FF_API_FORMAT_PARAMETERS
@ -277,7 +277,7 @@ static int grab_read_header(AVFormatContext *s1, AVFormatParameters *ap)
ret = AVERROR(EINVAL); ret = AVERROR(EINVAL);
goto out; goto out;
} }
if ((ret = av_parse_video_rate(&fps, s->framerate)) < 0) { if ((ret = av_parse_video_rate(&framerate, s->framerate)) < 0) {
av_log(s1, AV_LOG_ERROR, "Couldn't parse framerate.\n"); av_log(s1, AV_LOG_ERROR, "Couldn't parse framerate.\n");
goto out; goto out;
} }
@ -287,7 +287,7 @@ static int grab_read_header(AVFormatContext *s1, AVFormatParameters *ap)
if (ap->height > 0) if (ap->height > 0)
height = ap->height; height = ap->height;
if (ap->time_base.num) if (ap->time_base.num)
fps = (AVRational){ap->time_base.den, ap->time_base.num}; framerate = (AVRational){ap->time_base.den, ap->time_base.num};
#endif #endif
st = av_new_stream(s1, 0); st = av_new_stream(s1, 0);
@ -299,15 +299,15 @@ static int grab_read_header(AVFormatContext *s1, AVFormatParameters *ap)
s->width = width; s->width = width;
s->height = height; s->height = height;
s->per_frame = ((uint64_t)1000000 * fps.den) / fps.num; s->per_frame = ((uint64_t)1000000 * framerate.den) / framerate.num;
st->codec->codec_type = AVMEDIA_TYPE_VIDEO; st->codec->codec_type = AVMEDIA_TYPE_VIDEO;
st->codec->pix_fmt = PIX_FMT_YUV420P; st->codec->pix_fmt = PIX_FMT_YUV420P;
st->codec->codec_id = CODEC_ID_RAWVIDEO; st->codec->codec_id = CODEC_ID_RAWVIDEO;
st->codec->width = width; st->codec->width = width;
st->codec->height = height; st->codec->height = height;
st->codec->time_base.den = fps.num; st->codec->time_base.den = framerate.num;
st->codec->time_base.num = fps.den; st->codec->time_base.num = framerate.den;
if (bktr_init(s1->filename, width, height, s->standard, if (bktr_init(s1->filename, width, height, s->standard,