Browse Source

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.
tags/n3.0
Vittorio Giovara 9 years ago
parent
commit
18adc1fd3b
2 changed files with 4 additions and 3 deletions
  1. +3
    -2
      avconv_filter.c
  2. +1
    -1
      tests/ref/fate/zmbv-8bit

+ 3
- 2
avconv_filter.c View File

@@ -496,8 +496,9 @@ static int configure_input_video_filter(FilterGraph *fg, InputFilter *ifilter,
sar = ist->st->sample_aspect_ratio.num ? sar = ist->st->sample_aspect_ratio.num ?
ist->st->sample_aspect_ratio : ist->st->sample_aspect_ratio :
ist->dec_ctx->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, ist->hwaccel_retrieve_data ? ist->hwaccel_retrieved_pix_fmt : ist->dec_ctx->pix_fmt,
tb.num, tb.den, sar.num, sar.den); tb.num, tb.den, sar.num, sar.den);
snprintf(name, sizeof(name), "graph %d input from stream %d:%d", fg->index, snprintf(name, sizeof(name), "graph %d input from stream %d:%d", fg->index,


+ 1
- 1
tests/ref/fate/zmbv-8bit View File

@@ -1,4 +1,4 @@
#tb 0: 1000000/70086303
#tb 0: 15967/1119068
0, 0, 0, 1, 192000, 0x5234b617 0, 0, 0, 1, 192000, 0x5234b617
0, 1, 1, 1, 192000, 0x5234b617 0, 1, 1, 1, 192000, 0x5234b617
0, 2, 2, 1, 192000, 0x5234b617 0, 2, 2, 1, 192000, 0x5234b617


Loading…
Cancel
Save