virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-10 06:10:52 +02:00
Code Issues Releases Activity

Use av_parse_and_eval_expr() in av_parse_video_rate(), simplify.

Browse Source 
Originally committed as revision 25333 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Stefano Sabatini
2010-10-04 13:41:04 +00:00
parent 6b4ed22f75
commit bc12b3b11b
2 changed files with 8 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libavcore/avcore.h
View File

@@ -28,7 +28,7 @@
#define LIBAVCORE_VERSION_MAJOR 0 #define LIBAVCORE_VERSION_MAJOR 0
#define LIBAVCORE_VERSION_MINOR 9 #define LIBAVCORE_VERSION_MINOR 9
#define LIBAVCORE_VERSION_MICRO 0 #define LIBAVCORE_VERSION_MICRO 1
#define LIBAVCORE_VERSION_INT AV_VERSION_INT(LIBAVCORE_VERSION_MAJOR, \ #define LIBAVCORE_VERSION_INT AV_VERSION_INT(LIBAVCORE_VERSION_MAJOR, \
LIBAVCORE_VERSION_MINOR, \ LIBAVCORE_VERSION_MINOR, \

23
libavcore/parseutils.c
View File

@@ -23,6 +23,7 @@
#include "parseutils.h" #include "parseutils.h"
#include "libavutil/avutil.h" #include "libavutil/avutil.h"
#include "libavutil/eval.h"
typedef struct { typedef struct {
const char *abbr; const char *abbr;
@@ -115,9 +116,9 @@ int av_parse_video_size(int *width_ptr, int *height_ptr, const char *str)
int av_parse_video_rate(AVRational *rate, const char *arg) int av_parse_video_rate(AVRational *rate, const char *arg)
{ {
int i; int i, ret;
int n = FF_ARRAY_ELEMS(video_rate_abbrs); int n = FF_ARRAY_ELEMS(video_rate_abbrs);
char *cp; double res;
/* First, we check our abbreviation table */ /* First, we check our abbreviation table */
for (i = 0; i < n; ++i) for (i = 0; i < n; ++i)
@@ -127,20 +128,10 @@ int av_parse_video_rate(AVRational *rate, const char *arg)
} }
/* Then, we try to parse it as fraction */ /* Then, we try to parse it as fraction */
cp = strchr(arg, '/'); if ((ret = av_parse_and_eval_expr(&res, arg, NULL, NULL, NULL, NULL, NULL, NULL,
if (!cp) NULL, 0, NULL)) < 0)
cp = strchr(arg, ':'); return ret;
if (cp) { *rate = av_d2q(res, 1001000);
char *cpp;
rate->num = strtol(arg, &cpp, 10);
if (cpp != arg || cpp == cp)
rate->den = strtol(cp+1, &cpp, 10);
else
rate->num = 0;
} else {
/* Finally we give up and parse it as double */
*rate = av_d2q(strtod(arg, 0), 1001000);
}
if (rate->num <= 0 || rate->den <= 0) if (rate->num <= 0 || rate->den <= 0)
return AVERROR(EINVAL); return AVERROR(EINVAL);
return 0; return 0;