[FFmpeg-cvslog] lswr: improve rematrixing error message.

[Nicolas George]

ffmpeg | branch: master | Nicolas George <nicolas.george at normalesup.org> | Mon Dec 31 12:12:23 2012 +0100| [5f12d5ad78f72391cb8656e8ab0b5e33beb739f8] | committer: Nicolas George

lswr: improve rematrixing error message.

Report channel layout/count for insufficiently determined
rematrixing.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5f12d5ad78f72391cb8656e8ab0b5e33beb739f8
---

 libswresample/swresample.c |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/libswresample/swresample.c b/libswresample/swresample.c
index 263acfa..2477847 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;
     }