Browse code

Make ffmpeg warns the user when the selected sample format is ignored.

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit fa34a3626cf1aa19acbe9f8c6fcddb6c3eb8eaa1)

Stefano Sabatini authored on 2011/01/14 23:50:55
Showing 1 changed files
... ...
@@ -600,8 +600,14 @@ static void choose_sample_fmt(AVStream *st, AVCodec *codec)
600 600
             if(*p == st->codec->sample_fmt)
601 601
                 break;
602 602
         }
603
-        if(*p == -1)
603
+        if (*p == -1) {
604
+            av_log(NULL, AV_LOG_WARNING,
605
+                   "Incompatible sample format '%s' for codec '%s', auto-selecting format '%s'\n",
606
+                   av_get_sample_fmt_name(st->codec->sample_fmt),
607
+                   codec->name,
608
+                   av_get_sample_fmt_name(codec->sample_fmts[0]));
604 609
             st->codec->sample_fmt = codec->sample_fmts[0];
610
+        }
605 611
     }
606 612
 }
607 613