generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Make VideoFrameRateAbbr contain a rational rather than two ints for

Browse Source 
num and den. Simplify.

Originally committed as revision 24523 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Stefano Sabatini 2010-07-26 23:12:45 +00:00
parent dc4a50a073
commit c90c80ac28
1 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
libavcore/parseutils.c
View File

@ -31,7 +31,7 @@ typedef struct {
typedef struct {
const char *abbr;
int rate_num, rate_den;
AVRational rate;
} VideoRateAbbr;
static const VideoSizeAbbr video_size_abbrs[] = {
@ -75,14 +75,14 @@ static const VideoSizeAbbr video_size_abbrs[] = {
};
static const VideoRateAbbr video_rate_abbrs[]= {
{ "ntsc", 30000, 1001 },
{ "pal", 25, 1 },
{ "qntsc", 30000, 1001 }, /* VCD compliant NTSC */
{ "qpal", 25, 1 }, /* VCD compliant PAL */
{ "sntsc", 30000, 1001 }, /* square pixel NTSC */
{ "spal", 25, 1 }, /* square pixel PAL */
{ "film", 24, 1 },
{ "ntsc-film", 24000, 1001 },
{ "ntsc", { 30000, 1001 } },
{ "pal", { 25, 1 } },
{ "qntsc", { 30000, 1001 } }, /* VCD compliant NTSC */
{ "qpal", { 25, 1 } }, /* VCD compliant PAL */
{ "sntsc", { 30000, 1001 } }, /* square pixel NTSC */
{ "spal", { 25, 1 } }, /* square pixel PAL */
{ "film", { 24, 1 } },
{ "ntsc-film", { 24000, 1001 } },
};
int av_parse_video_size(int *width_ptr, int *height_ptr, const char *str)
@ -122,8 +122,7 @@ int av_parse_video_rate(AVRational *rate, const char *arg)
/* First, we check our abbreviation table */
for (i = 0; i < n; ++i)
if (!strcmp(video_rate_abbrs[i].abbr, arg)) {
rate->num = video_rate_abbrs[i].rate_num;
rate->den = video_rate_abbrs[i].rate_den;
*rate = video_rate_abbrs[i].rate;
return 0;
}