summaryrefslogtreecommitdiff
path: root/libavutil/opt.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2015-02-06 22:14:15 +0100
committerMichael Niedermayer <michaelni@gmx.at>2015-02-06 22:15:20 +0100
commita0640e63463e6428b80422c89e1bfc96147ecfc6 (patch)
treeb1a44a6f2080230fbbc5a0103daa5c4d5c511ec8 /libavutil/opt.c
parent6ecc3fd61225c79116de64167e3bf47736f0e779 (diff)
avutil/opt: Fix types used to access AV_OPT_TYPE_PIXEL_FMT
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/opt.c')
-rw-r--r--libavutil/opt.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libavutil/opt.c b/libavutil/opt.c
index c68dacc0c6..cf05cca009 100644
--- a/libavutil/opt.c
+++ b/libavutil/opt.c
@@ -65,7 +65,7 @@ static int read_number(const AVOption *o, const void *dst, double *num, int *den
{
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:
@@ -100,8 +100,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: