summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-02-18 21:43:57 +0100
committerMichael Niedermayer <michaelni@gmx.at>2014-02-18 21:49:56 +0100
commit8f853159f6ea6f6453e69a26f4ea62f9d35f4181 (patch)
tree9a433b12f50b26acd087d38c863a5739f8af5cf6
parent3e70c7023e598afa15d40ae3fce62ae1eee25195 (diff)
downloadffmpeg-streaming-8f853159f6ea6f6453e69a26f4ea62f9d35f4181.zip
ffmpeg-streaming-8f853159f6ea6f6453e69a26f4ea62f9d35f4181.tar.gz
avutil/opt: preserve fractions in set_string_number()
This avoids going over a double precission float, which may loose precission Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--libavutil/opt.c9
-rw-r--r--tests/ref/fate/zmbv-8bit2
2 files changed, 10 insertions, 1 deletions
diff --git a/libavutil/opt.c b/libavutil/opt.c
index 6ecc14e..c74f220 100644
--- a/libavutil/opt.c
+++ b/libavutil/opt.c
@@ -195,6 +195,15 @@ static int set_string(void *obj, const AVOption *o, const char *val, uint8_t **d
static int set_string_number(void *obj, void *target_obj, const AVOption *o, const char *val, void *dst)
{
int ret = 0, notfirst = 0;
+ int num, den;
+ char c;
+
+ if (sscanf(val, "%d%*1[:/]%d%c", &num, &den, &c) == 2) {
+ if ((ret = write_number(obj, o, dst, 1, den, num)) >= 0)
+ return ret;
+ ret = 0;
+ }
+
for (;;) {
int i, den = 1;
char buf[256];
diff --git a/tests/ref/fate/zmbv-8bit b/tests/ref/fate/zmbv-8bit
index f104c98..9f02ae3 100644
--- a/tests/ref/fate/zmbv-8bit
+++ b/tests/ref/fate/zmbv-8bit
@@ -1,4 +1,4 @@
-#tb 0: 15967/1119068
+#tb 0: 1000000/70086303
0, 0, 0, 1, 192000, 0x5234b617
0, 1, 1, 1, 192000, 0x5234b617
0, 2, 2, 1, 192000, 0x5234b617
OpenPOWER on IntegriCloud