summaryrefslogtreecommitdiff
path: root/libswresample
diff options
context:
space:
mode:
authorNicolas George <nicolas.george@normalesup.org>2012-12-31 12:12:23 +0100
committerNicolas George <nicolas.george@normalesup.org>2012-12-31 18:43:04 +0100
commit5f12d5ad78f72391cb8656e8ab0b5e33beb739f8 (patch)
tree742b52979a3501604d5d376576d18bceab6d655c /libswresample
parent08196c785a1df33da435c5a669c9c560f647290c (diff)
downloadffmpeg-5f12d5ad78f72391cb8656e8ab0b5e33beb739f8.tar.gz
lswr: improve rematrixing error message.
Report channel layout/count for insufficiently determined rematrixing.
Diffstat (limited to 'libswresample')
-rw-r--r--libswresample/swresample.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/libswresample/swresample.c b/libswresample/swresample.c
index 263acfa7d1..2477847388 100644
--- a/libswresample/swresample.c
+++ b/libswresample/swresample.c
@@ -334,7 +334,11 @@ av_cold int swr_init(struct SwrContext *s){
}
if ((!s->out_ch_layout || !s->in_ch_layout) && s->used_ch_count != s->out.ch_count && !s->rematrix_custom) {
- av_log(s, AV_LOG_ERROR, "Rematrix is needed but there is not enough information to do it\n");
+ char l1[1024], l2[1024];
+ av_get_channel_layout_string(l1, sizeof(l1), s-> in.ch_count, s-> in_ch_layout);
+ av_get_channel_layout_string(l2, sizeof(l2), s->out.ch_count, s->out_ch_layout);
+ av_log(s, AV_LOG_ERROR, "Rematrix is needed between %s and %s "
+ "but there is not enough information to do it\n", l1, l2);
return -1;
}