1. ffmpeg
  2. Commit f399f826ee2d1e55bdae1495db9c1885589e4de1
Browse code

Merge commit 'c060d046aa2f89c0e601a2dcfbce53f0e36cf498'

* commit 'c060d046aa2f89c0e601a2dcfbce53f0e36cf498':
af_resample: Set the number of samples in the last frame

Merged-by: Michael Niedermayer <michaelni@gmx.at>

Michael Niedermayer authored on 2015/06/22 03:54:38
Showing 2 changed files
libavfilter/af_resample.c
History View file @ f399f82
... ... 
@@ -201,6 +201,7 @@ static int request_frame(AVFilterLink *outlink)
201 201 
             return (ret == 0) ? AVERROR_EOF : ret;
202 202 
         }
203 203
204 
+        frame->nb_samples = ret;
204 205 
         frame->pts = s->next_pts;
205 206 
         return ff_filter_frame(outlink, frame);
206 207 
     }
tests/fate/libavresample.mak
History View file @ f399f82
... ... 
@@ -38,7 +38,7 @@ fate-lavr-resample-$(3)-$(1)-$(2): CMD = ffmpeg -i $(TARGET_PATH)/tests/data/asy
38 38 
 fate-lavr-resample-$(3)-$(1)-$(2): CMP = oneoff
39 39 
 fate-lavr-resample-$(3)-$(1)-$(2): CMP_UNIT = $(5)
40 40 
 fate-lavr-resample-$(3)-$(1)-$(2): FUZZ = 6
41 
-fate-lavr-resample-$(3)-$(1)-$(2): REF = $(SAMPLES)/lavr/lavr-resample-$(3)-$(1)-$(2)-v2
41 
+fate-lavr-resample-$(3)-$(1)-$(2): REF = $(SAMPLES)/lavr/lavr-resample-$(3)-$(1)-$(2)-v3
42 42 
 endef
43 43
44 44 
 $(call CROSS_TEST,$(SAMPLERATES),RESAMPLE,s16p,s16le,s16)