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
(parent:
f9fefa4
)
swresample/swresample: replace always true if() by av_assert0()
author
Michael Niedermayer
<michaelni@gmx.at>
Sun, 5 Oct 2014 23:29:15 +0000
(
01:29
+0200)
committer
Michael Niedermayer
<michaelni@gmx.at>
Sun, 5 Oct 2014 23:29:15 +0000
(
01:29
+0200)
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
c325513
..
fc58d43
100644
(file)
--- a/
libswresample/swresample.c
+++ b/
libswresample/swresample.c
@@
-668,8
+668,8
@@
int swr_convert(struct SwrContext *s, uint8_t *out_arg[SWR_CH_MAX], int out_coun
continue;
}
- if(s->drop_output || !out_arg)
-
return 0;
+ av_assert0(s->drop_output);
+ return 0;
}
if(!in_arg){