OSDN Git Service
(root)
/
android-x86
/
external-ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
33e997d
)
avfilter/vf_lut3d: actually skip lines when encountering DOMAIN_ string
author
Paul B Mahol
<onemda@gmail.com>
Sun, 12 Mar 2017 17:59:05 +0000
(18:59 +0100)
committer
Paul B Mahol
<onemda@gmail.com>
Mon, 13 Mar 2017 14:30:05 +0000
(15:30 +0100)
Signed-off-by: Paul B Mahol <onemda@gmail.com>
libavfilter/vf_lut3d.c
patch
|
blob
|
history
diff --git
a/libavfilter/vf_lut3d.c
b/libavfilter/vf_lut3d.c
index
b136cda
..
7a294b0
100644
(file)
--- a/
libavfilter/vf_lut3d.c
+++ b/
libavfilter/vf_lut3d.c
@@
-320,6
+320,7
@@
static int parse_cube(AVFilterContext *ctx, FILE *f)
struct rgbvec *vec = &lut3d->lut[i][j][k];
do {
+try_again:
NEXT_LINE(0);
if (!strncmp(line, "DOMAIN_", 7)) {
float *vals = NULL;
@@
-330,7
+331,7
@@
static int parse_cube(AVFilterContext *ctx, FILE *f)
sscanf(line + 11, "%f %f %f", vals, vals + 1, vals + 2);
av_log(ctx, AV_LOG_DEBUG, "min: %f %f %f | max: %f %f %f\n",
min[0], min[1], min[2], max[0], max[1], max[2]);
-
continue
;
+
goto try_again
;
}
} while (skip_line(line));
if (sscanf(line, "%f %f %f", &vec->r, &vec->g, &vec->b) != 3)