Commit ca9c5a4d authored by Baptiste Coudurier's avatar Baptiste Coudurier
Browse files

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
parent ae58b54b
......@@ -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))
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment