Commit f399f826 authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit 'c060d046'

* commit 'c060d046':
  af_resample: Set the number of samples in the last frame
Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents ae215e2b c060d046
...@@ -201,6 +201,7 @@ static int request_frame(AVFilterLink *outlink) ...@@ -201,6 +201,7 @@ static int request_frame(AVFilterLink *outlink)
return (ret == 0) ? AVERROR_EOF : ret; return (ret == 0) ? AVERROR_EOF : ret;
} }
frame->nb_samples = ret;
frame->pts = s->next_pts; frame->pts = s->next_pts;
return ff_filter_frame(outlink, frame); return ff_filter_frame(outlink, frame);
} }
......
...@@ -38,7 +38,7 @@ fate-lavr-resample-$(3)-$(1)-$(2): CMD = ffmpeg -i $(TARGET_PATH)/tests/data/asy ...@@ -38,7 +38,7 @@ fate-lavr-resample-$(3)-$(1)-$(2): CMD = ffmpeg -i $(TARGET_PATH)/tests/data/asy
fate-lavr-resample-$(3)-$(1)-$(2): CMP = oneoff fate-lavr-resample-$(3)-$(1)-$(2): CMP = oneoff
fate-lavr-resample-$(3)-$(1)-$(2): CMP_UNIT = $(5) fate-lavr-resample-$(3)-$(1)-$(2): CMP_UNIT = $(5)
fate-lavr-resample-$(3)-$(1)-$(2): FUZZ = 6 fate-lavr-resample-$(3)-$(1)-$(2): FUZZ = 6
fate-lavr-resample-$(3)-$(1)-$(2): REF = $(SAMPLES)/lavr/lavr-resample-$(3)-$(1)-$(2)-v2 fate-lavr-resample-$(3)-$(1)-$(2): REF = $(SAMPLES)/lavr/lavr-resample-$(3)-$(1)-$(2)-v3
endef endef
$(call CROSS_TEST,$(SAMPLERATES),RESAMPLE,s16p,s16le,s16) $(call CROSS_TEST,$(SAMPLERATES),RESAMPLE,s16p,s16le,s16)
......
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