diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-09-05 14:44:05 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-09-05 14:44:05 +0200 |
| commit | 98840ee0174b227543f2c85f3df09e97ad4f2577 (patch) | |
| tree | 80c17ae52b4056988905d00167ad145edfdb1bdf /libavfilter | |
| parent | d46c1c72e4f4e1e0b0659a1ab0f57f7092c638f8 (diff) | |
| parent | c7b610aa0b1bac47eea0056b13fe6e982b85844a (diff) | |
| download | ffmpeg-98840ee0174b227543f2c85f3df09e97ad4f2577.tar.gz | |
Merge commit 'c7b610aa0b1bac47eea0056b13fe6e982b85844a'
* commit 'c7b610aa0b1bac47eea0056b13fe6e982b85844a':
avopt: Explicitly store float/double option defaults in .dbl
Conflicts:
libavcodec/ac3dec.c
libavcodec/libx264.c
libavfilter/af_amix.c
libavfilter/af_asyncts.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter')
| -rw-r--r-- | libavfilter/af_amix.c | 2 | ||||
| -rw-r--r-- | libavfilter/af_asyncts.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/libavfilter/af_amix.c b/libavfilter/af_amix.c index 4ba7718981..cfe23159e2 100644 --- a/libavfilter/af_amix.c +++ b/libavfilter/af_amix.c @@ -185,7 +185,7 @@ static const AVOption amix_options[] = { { "first", "Duration of first input.", 0, AV_OPT_TYPE_CONST, { .i64 = DURATION_FIRST }, INT_MIN, INT_MAX, A|F, "duration" }, { "dropout_transition", "Transition time, in seconds, for volume " "renormalization when an input stream ends.", - OFFSET(dropout_transition), AV_OPT_TYPE_FLOAT, { 2.0 }, 0, INT_MAX, A|F }, + OFFSET(dropout_transition), AV_OPT_TYPE_FLOAT, { .dbl = 2.0 }, 0, INT_MAX, A|F }, { NULL }, }; diff --git a/libavfilter/af_asyncts.c b/libavfilter/af_asyncts.c index ccdd92c8cc..0ecaf52ee8 100644 --- a/libavfilter/af_asyncts.c +++ b/libavfilter/af_asyncts.c @@ -49,7 +49,7 @@ typedef struct ASyncContext { static const AVOption asyncts_options[] = { { "compensate", "Stretch/squeeze the data to make it match the timestamps", OFFSET(resample), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, 1, A|F }, { "min_delta", "Minimum difference between timestamps and audio data " - "(in seconds) to trigger padding/trimmin the data.", OFFSET(min_delta_sec), AV_OPT_TYPE_FLOAT, { 0.1 }, 0, INT_MAX, A|F }, + "(in seconds) to trigger padding/trimmin the data.", OFFSET(min_delta_sec), AV_OPT_TYPE_FLOAT, { .dbl = 0.1 }, 0, INT_MAX, A|F }, { "max_comp", "Maximum compensation in samples per second.", OFFSET(max_comp), AV_OPT_TYPE_INT, { .i64 = 500 }, 0, INT_MAX, A|F }, { "first_pts", "Assume the first pts should be this value.", OFFSET(pts), AV_OPT_TYPE_INT64, { .i64 = AV_NOPTS_VALUE }, INT64_MIN, INT64_MAX, A|F }, { NULL }, |