[FFmpeg-cvslog] Make ffmpeg warns the user when the selected sample format is ignored.

Stefano Sabatini git
Mon Jan 31 18:48:16 CET 2011


ffmpeg | branch: master | Stefano Sabatini <stefano.sabatini-lala at poste.it> | Fri Jan 14 15:50:55 2011 +0100| [5a8d1075ec4243cca690ac6650cce4df88ec0ad5] | committer: Michael Niedermayer

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

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

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

 ffmpeg.c |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/ffmpeg.c b/ffmpeg.c
index 691b73e..df89018 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -600,8 +600,14 @@ static void choose_sample_fmt(AVStream *st, AVCodec *codec)
             if(*p == st->codec->sample_fmt)
                 break;
         }
-        if(*p == -1)
+        if (*p == -1) {
+            av_log(NULL, AV_LOG_WARNING,
+                   "Incompatible sample format '%s' for codec '%s', auto-selecting format '%s'\n",
+                   av_get_sample_fmt_name(st->codec->sample_fmt),
+                   codec->name,
+                   av_get_sample_fmt_name(codec->sample_fmts[0]));
             st->codec->sample_fmt = codec->sample_fmts[0];
+        }
     }
 }
 




More information about the ffmpeg-cvslog mailing list