Skip to content

F
ffmpeg
Commit 1750b45c authored by Michael Niedermayer's avatar Michael Niedermayer
Browse files
Options

avutil/opt: Fix type used to access AV_OPT_TYPE_SAMPLE_FMT 

Signed-off-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parent a0640e63
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
libavutil/opt.c
View file @ 1750b45c
...@@ -66,7 +66,7 @@ static int read_number(const AVOption *o, const void *dst, double *num, int *den ...@@ -66,7 +66,7 @@ static int read_number(const AVOption *o, const void *dst, double *num, int *den
switch (o->type) { switch (o->type) {
case AV_OPT_TYPE_FLAGS: *intnum = *(unsigned int*)dst;return 0; case AV_OPT_TYPE_FLAGS: *intnum = *(unsigned int*)dst;return 0;
case AV_OPT_TYPE_PIXEL_FMT: *intnum = *(enum AVPixelFormat *)dst;return 0; case AV_OPT_TYPE_PIXEL_FMT: *intnum = *(enum AVPixelFormat *)dst;return 0;
case AV_OPT_TYPE_SAMPLE_FMT: case AV_OPT_TYPE_SAMPLE_FMT:*intnum = *(enum AVSampleFormat*)dst;return 0;
case AV_OPT_TYPE_INT: *intnum = *(int *)dst;return 0; case AV_OPT_TYPE_INT: *intnum = *(int *)dst;return 0;
case AV_OPT_TYPE_CHANNEL_LAYOUT: case AV_OPT_TYPE_CHANNEL_LAYOUT:
case AV_OPT_TYPE_DURATION: case AV_OPT_TYPE_DURATION:
...@@ -101,8 +101,8 @@ static int write_number(void *obj, const AVOption *o, void *dst, double num, int ...@@ -101,8 +101,8 @@ static int write_number(void *obj, const AVOption *o, void *dst, double num, int
switch (o->type) { switch (o->type) {
case AV_OPT_TYPE_PIXEL_FMT: *(enum AVPixelFormat *)dst = llrint(num/den) * intnum; break; case AV_OPT_TYPE_PIXEL_FMT: *(enum AVPixelFormat *)dst = llrint(num/den) * intnum; break;
case AV_OPT_TYPE_SAMPLE_FMT:*(enum AVSampleFormat*)dst = llrint(num/den) * intnum; break;
case AV_OPT_TYPE_FLAGS: case AV_OPT_TYPE_FLAGS:
case AV_OPT_TYPE_SAMPLE_FMT:
case AV_OPT_TYPE_INT: *(int *)dst= llrint(num/den)*intnum; break; case AV_OPT_TYPE_INT: *(int *)dst= llrint(num/den)*intnum; break;
case AV_OPT_TYPE_DURATION: case AV_OPT_TYPE_DURATION:
case AV_OPT_TYPE_CHANNEL_LAYOUT: case AV_OPT_TYPE_CHANNEL_LAYOUT:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment