[FFmpeg-cvslog] lswr/rematrix: specify explicitly the name of the unsupported channel layouts

Stefano Sabatini git at videolan.org
Thu Jun 21 12:49:03 CEST 2012


ffmpeg | branch: master | Stefano Sabatini <stefasab at gmail.com> | Thu Jun 21 11:53:50 2012 +0200| [065851ffacd0c0c6fde6e52c5cba4160341db52a] | committer: Stefano Sabatini

lswr/rematrix: specify explicitly the name of the unsupported channel layouts

Help debugging.

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

 libswresample/rematrix.c |    7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/libswresample/rematrix.c b/libswresample/rematrix.c
index aa66487..3784111 100644
--- a/libswresample/rematrix.c
+++ b/libswresample/rematrix.c
@@ -125,6 +125,7 @@ static int auto_matrix(SwrContext *s)
     double matrix[64][64]={{0}};
     int64_t unaccounted= s->in_ch_layout & ~s->out_ch_layout;
     double maxcoef=0;
+    char buf[128];
 
     memset(s->matrix, 0, sizeof(s->matrix));
     for(i=0; i<64; i++){
@@ -133,11 +134,13 @@ static int auto_matrix(SwrContext *s)
     }
 
     if(!sane_layout(s->in_ch_layout)){
-        av_log(s, AV_LOG_ERROR, "Input channel layout isnt supported\n");
+        av_get_channel_layout_string(buf, sizeof(buf), -1, s->in_ch_layout);
+        av_log(s, AV_LOG_ERROR, "Input channel layout '%s' is not supported\n", buf);
         return AVERROR(EINVAL);
     }
     if(!sane_layout(s->out_ch_layout)){
-        av_log(s, AV_LOG_ERROR, "Output channel layout isnt supported\n");
+        av_get_channel_layout_string(buf, sizeof(buf), -1, s->out_ch_layout);
+        av_log(s, AV_LOG_ERROR, "Output channel layout '%s' is not supported\n", buf);
         return AVERROR(EINVAL);
     }
 



More information about the ffmpeg-cvslog mailing list