Write sample format description within avcodec_string()

Originally committed as revision 14485 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/utils.c b/libavcodec/utils.c
index 6af208d..1c98c31 100644 (file)
--- a/libavcodec/utils.c
+++ b/libavcodec/utils.c
@@ -31,6 +31,7 @@
 #include "dsputil.h"
 #include "opt.h"
 #include "imgconvert.h"
+#include "audioconvert.h"
 #include <stdarg.h>
 #include <limits.h>
 #include <float.h>
@@ -1148,6 +1149,10 @@ void avcodec_string(char *buf, int buf_size, AVCodecContext *enc, int encode)
                      enc->sample_rate,
                      channels_str);
         }
+        if (enc->sample_fmt != SAMPLE_FMT_NONE) {
+            snprintf(buf + strlen(buf), buf_size - strlen(buf),
+                     ", %s", avcodec_get_sample_fmt_name(enc->sample_fmt));
+        }
 
         /* for PCM codecs, compute bitrate directly */
         switch(enc->codec_id) {