aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2015-02-06 22:14:15 +0100
committerMichael Niedermayer <michaelni@gmx.at>2015-02-17 19:43:18 +0100
commit68d83bc3a69232e630f28fed6d3d6a03f888d7c9 (patch)
tree579d151d5aaf3617175092b5d0f77e7d5ce494c2
parent0c9d465e98c72a527ff5c6a2f78d537c03810112 (diff)
downloadffmpeg-68d83bc3a69232e630f28fed6d3d6a03f888d7c9.tar.gz
avutil/opt: Fix types used to access AV_OPT_TYPE_PIXEL_FMT
Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit a0640e63463e6428b80422c89e1bfc96147ecfc6) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--libavutil/opt.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libavutil/opt.c b/libavutil/opt.c
index 8c58237d5a..781a8c2c89 100644
--- a/libavutil/opt.c
+++ b/libavutil/opt.c
@@ -75,7 +75,7 @@ static int read_number(const AVOption *o, void *dst, double *num, int *den, int6
{
switch (o->type) {
case AV_OPT_TYPE_FLAGS: *intnum = *(unsigned int*)dst;return 0;
- case AV_OPT_TYPE_PIXEL_FMT:
+ case AV_OPT_TYPE_PIXEL_FMT: *intnum = *(enum AVPixelFormat *)dst;return 0;
case AV_OPT_TYPE_SAMPLE_FMT:
case AV_OPT_TYPE_INT: *intnum = *(int *)dst;return 0;
case AV_OPT_TYPE_CHANNEL_LAYOUT:
@@ -110,8 +110,8 @@ static int write_number(void *obj, const AVOption *o, void *dst, double num, int
}
switch (o->type) {
+ case AV_OPT_TYPE_PIXEL_FMT: *(enum AVPixelFormat *)dst = llrint(num/den) * intnum; break;
case AV_OPT_TYPE_FLAGS:
- case AV_OPT_TYPE_PIXEL_FMT:
case AV_OPT_TYPE_SAMPLE_FMT:
case AV_OPT_TYPE_INT: *(int *)dst= llrint(num/den)*intnum; break;
case AV_OPT_TYPE_DURATION: