diff options
| author | Vittorio Giovara <vittorio.giovara@gmail.com> | 2015-09-10 17:05:50 +0200 |
|---|---|---|
| committer | Vittorio Giovara <vittorio.giovara@gmail.com> | 2015-09-13 17:34:45 +0200 |
| commit | 18adc1fd3bb739a240c59f87ec6837fdfa89d32e (patch) | |
| tree | 45b4076aa5a644b481d427b9963ef8f3fe43d205 | |
| parent | 10de408738d28ab17aa5c1fdccd809b0637c12d5 (diff) | |
avconv_filter: Use full named options
This introduces a slight timebase computation difference in zmbv-8bit
fate test. This is expected since the new options are double instead
of ints, and the additional precision skews the results in a non
meaningful way.
| -rw-r--r-- | avconv_filter.c | 5 | ||||
| -rw-r--r-- | tests/ref/fate/zmbv-8bit | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/avconv_filter.c b/avconv_filter.c index 18deb1f891..976d5214e4 100644 --- a/avconv_filter.c +++ b/avconv_filter.c @@ -496,8 +496,9 @@ static int configure_input_video_filter(FilterGraph *fg, InputFilter *ifilter, sar = ist->st->sample_aspect_ratio.num ? ist->st->sample_aspect_ratio : ist->dec_ctx->sample_aspect_ratio; - snprintf(args, sizeof(args), "%d:%d:%d:%d:%d:%d:%d", ist->dec_ctx->width, - ist->dec_ctx->height, + snprintf(args, sizeof(args), + "width=%d:height=%d:pix_fmt=%d:time_base=%d/%d:sar=%d/%d", + ist->dec_ctx->width, ist->dec_ctx->height, ist->hwaccel_retrieve_data ? ist->hwaccel_retrieved_pix_fmt : ist->dec_ctx->pix_fmt, tb.num, tb.den, sar.num, sar.den); snprintf(name, sizeof(name), "graph %d input from stream %d:%d", fg->index, diff --git a/tests/ref/fate/zmbv-8bit b/tests/ref/fate/zmbv-8bit index 9f02ae3668..f104c98c95 100644 --- a/tests/ref/fate/zmbv-8bit +++ b/tests/ref/fate/zmbv-8bit @@ -1,4 +1,4 @@ -#tb 0: 1000000/70086303 +#tb 0: 15967/1119068 0, 0, 0, 1, 192000, 0x5234b617 0, 1, 1, 1, 192000, 0x5234b617 0, 2, 2, 1, 192000, 0x5234b617 |