git.videolan.org
/
ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(from parent 1:
02f7665
)
swresample/swresample: fix sample drop loop end condition
author
Michael Niedermayer
<michaelni@gmx.at>
Sun, 5 Oct 2014 23:08:20 +0000
(
01:08
+0200)
committer
Michael Niedermayer
<michaelni@gmx.at>
Sun, 5 Oct 2014 23:29:06 +0000
(
01:29
+0200)
Fixes Ticket3985
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
libswresample/swresample.c
patch
|
blob
|
history
diff --git
a/libswresample/swresample.c
b/libswresample/swresample.c
index
32bbee3
..
c325513
100644
(file)
--- a/
libswresample/swresample.c
+++ b/
libswresample/swresample.c
@@
-663,6
+663,8
@@
int swr_convert(struct SwrContext *s, uint8_t *out_arg[SWR_CH_MAX], int out_coun
in_count = 0;
if(ret>0) {
s->drop_output -= ret;
+ if (!s->drop_output && !out_arg)
+ return 0;
continue;
}