[FFmpeg-cvslog] rawdec: use a default sample rate if none is specified.

Michael Niedermayer git at videolan.org
Mon Nov 21 19:59:18 CET 2011


ffmpeg | branch: release/0.7 | Michael Niedermayer <michaelni at gmx.at> | Fri Nov 18 22:34:41 2011 +0100| [64a854d06bb36bd417bdd1ea16567732dc890ad3] | committer: Michael Niedermayer

rawdec: use a default sample rate if none is specified.
Fixes "ffmpeg -f s16le -i /dev/zero"

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit fca85ce5ecc8acba6a5cf10c5f99e932b26c6367)

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

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

 libavformat/rawdec.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/libavformat/rawdec.c b/libavformat/rawdec.c
index 02e335a..d4383d5 100644
--- a/libavformat/rawdec.c
+++ b/libavformat/rawdec.c
@@ -60,9 +60,9 @@ int ff_raw_read_header(AVFormatContext *s, AVFormatParameters *ap)
             if (s1->sample_rate)
                 st->codec->sample_rate = s1->sample_rate;
             if (st->codec->sample_rate <= 0) {
-                av_log(s, AV_LOG_ERROR, "Invalid sample rate %d specified\n",
+                av_log(s, AV_LOG_WARNING, "Invalid sample rate %d specified using default of 44100\n",
                        st->codec->sample_rate);
-                return AVERROR(EINVAL);
+                st->codec->sample_rate= 44100;
             }
 
             if (s1->channels)



More information about the ffmpeg-cvslog mailing list