make has_codec_parameters not returning true when sample_fmt is not set

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

diff --git a/libavformat/utils.c b/libavformat/utils.c
index ee6a71e4394212f6805ba53b0e44f6de809a014e..c4ebf2087b124b8a2dd518a5cd378bea2166aeb0 100644 (file)
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
@@ -1842,7 +1842,7 @@ static int has_codec_parameters(AVCodecContext *enc)
     int val;
     switch(enc->codec_type) {
     case CODEC_TYPE_AUDIO:
-        val = enc->sample_rate && enc->channels;
+        val = enc->sample_rate && enc->channels && enc->sample_fmt != SAMPLE_FMT_NONE;
         if(!enc->frame_size &&
            (enc->codec_id == CODEC_ID_VORBIS ||
             enc->codec_id == CODEC_ID_AAC))