1. ffmpeg
  2. Commit d9618b964b179bd4f8cb55aa95e7426f914c95fe
Browse code

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>

Michael Niedermayer authored on 2015/02/07 06:14:15
Showing 1 changed files
libavutil/opt.c
History View file @ d9618b9
... ... 
@@ -74,7 +74,7 @@ static int read_number(const AVOption *o, void *dst, double *num, int *den, int6
74 74 
 {
75 75 
     switch (o->type) {
76 76 
     case AV_OPT_TYPE_FLAGS:     *intnum = *(unsigned int*)dst;return 0;
77 
-    case AV_OPT_TYPE_PIXEL_FMT:
77 
+    case AV_OPT_TYPE_PIXEL_FMT: *intnum = *(enum AVPixelFormat *)dst;return 0;
78 78 
     case AV_OPT_TYPE_SAMPLE_FMT:
79 79 
     case AV_OPT_TYPE_INT:       *intnum = *(int         *)dst;return 0;
80 80 
     case AV_OPT_TYPE_INT64:     *intnum = *(int64_t     *)dst;return 0;
... ... 
@@ -97,8 +97,8 @@ static int write_number(void *obj, const AVOption *o, void *dst, double num, int
97 97 
     }
98 98
99 99 
     switch (o->type) {
100 
+    case AV_OPT_TYPE_PIXEL_FMT: *(enum AVPixelFormat *)dst = llrint(num/den) * intnum; break;
100 101 
     case AV_OPT_TYPE_FLAGS:
101 
-    case AV_OPT_TYPE_PIXEL_FMT:
102 102 
     case AV_OPT_TYPE_SAMPLE_FMT:
103 103 
     case AV_OPT_TYPE_INT:   *(int       *)dst= llrint(num/den)*intnum; break;
104 104 
     case AV_OPT_TYPE_INT64: *(int64_t   *)dst= llrint(num/den)*intnum; break;