highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge commit 'c060d046aa2f89c0e601a2dcfbce53f0e36cf498'

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

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2015-06-21 20:54:38 +02:00
parent ae215e2b42 c060d046aa
commit f399f826ee
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
libavfilter/af_resample.c
View File

@@ -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);
} }

2
tests/fate/libavresample.mak
View File

@@ -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)