OSDN Git Service
(root)
/
android-x86
/
external-ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
55d4457
)
Do not warn about wrong channel layout if no channel layout is defined.
author
Carl Eugen Hoyos
<cehoyos@ag.or.at>
Sun, 16 Oct 2011 15:12:53 +0000
(17:12 +0200)
committer
Carl Eugen Hoyos
<cehoyos@ag.or.at>
Sun, 16 Oct 2011 15:12:53 +0000
(17:12 +0200)
libswresample/swresample.c
patch
|
blob
|
history
diff --git
a/libswresample/swresample.c
b/libswresample/swresample.c
index
c0a1893
..
584c74b
100644
(file)
--- a/
libswresample/swresample.c
+++ b/
libswresample/swresample.c
@@
-166,7
+166,7
@@
int swr_init(SwrContext *s){
return -1;
}
- if(s-> in.ch_count && s->in.ch_count != av_get_channel_layout_nb_channels(s-> in_ch_layout)){
+ if(s-> in.ch_count && s->
in_ch_layout && s->
in.ch_count != av_get_channel_layout_nb_channels(s-> in_ch_layout)){
av_log(s, AV_LOG_WARNING, "Input channel layout has a different number of channels than there actually is, ignoring layout\n");
s-> in_ch_layout= 0;
}