[FFmpeg-cvslog] af_resample: Set the number of samples in the last frame

[Luca Barbato]

ffmpeg | branch: master | Luca Barbato <lu_zero at gentoo.org> | Sat Aug  2 01:58:07 2014 +0200| [c060d046aa2f89c0e601a2dcfbce53f0e36cf498] | committer: Luca Barbato

af_resample: Set the number of samples in the last frame

Otherwise trailing zeroes would appear.

Signed-off-by: Luca Barbato <lu_zero at gentoo.org>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c060d046aa2f89c0e601a2dcfbce53f0e36cf498
---

 libavfilter/af_resample.c    |    1 +
 tests/fate/libavresample.mak |    2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/libavfilter/af_resample.c b/libavfilter/af_resample.c
index fbe6105..b125d25 100644
--- a/libavfilter/af_resample.c
+++ b/libavfilter/af_resample.c
@@ -202,6 +202,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 4a48c9c..65a0e1e 100644
--- a/tests/fate/libavresample.mak
+++ b/tests/fate/libavresample.mak
@@ -38,7 +38,7 @@ fate-lavr-resample-$(3)-$(1)-$(2): CMD = avconv -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)