diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-06-21 20:54:38 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-06-21 20:55:23 +0200 |
| commit | f399f826ee2d1e55bdae1495db9c1885589e4de1 (patch) | |
| tree | 8b7ff1e049153ce0c8550bf4d596e1bc21d7b041 | |
| parent | ae215e2b42dd172f6bfd9f2dad44c9d5c11884bf (diff) | |
| parent | c060d046aa2f89c0e601a2dcfbce53f0e36cf498 (diff) | |
| download | ffmpeg-f399f826ee2d1e55bdae1495db9c1885589e4de1.tar.gz | |
Merge commit 'c060d046aa2f89c0e601a2dcfbce53f0e36cf498'
* commit 'c060d046aa2f89c0e601a2dcfbce53f0e36cf498':
af_resample: Set the number of samples in the last frame
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavfilter/af_resample.c | 1 | ||||
| -rw-r--r-- | tests/fate/libavresample.mak | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/libavfilter/af_resample.c b/libavfilter/af_resample.c index d65d4bc64a..ff1f956e04 100644 --- a/libavfilter/af_resample.c +++ b/libavfilter/af_resample.c @@ -201,6 +201,7 @@ static int request_frame(AVFilterLink *outlink) return (ret == 0) ? AVERROR_EOF : ret; } + frame->nb_samples = ret; frame->pts = s->next_pts; return ff_filter_frame(outlink, frame); } diff --git a/tests/fate/libavresample.mak b/tests/fate/libavresample.mak index c854a477ac..65c0898d82 100644 --- a/tests/fate/libavresample.mak +++ b/tests/fate/libavresample.mak @@ -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_UNIT = $(5) 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 $(call CROSS_TEST,$(SAMPLERATES),RESAMPLE,s16p,s16le,s16) |