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
This commit is contained in:
parent
ae58b54b3f
commit
ca9c5a4d37
@ -1842,7 +1842,7 @@ static int has_codec_parameters(AVCodecContext *enc)
|
|||||||
int val;
|
int val;
|
||||||
switch(enc->codec_type) {
|
switch(enc->codec_type) {
|
||||||
case CODEC_TYPE_AUDIO:
|
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 &&
|
if(!enc->frame_size &&
|
||||||
(enc->codec_id == CODEC_ID_VORBIS ||
|
(enc->codec_id == CODEC_ID_VORBIS ||
|
||||||
enc->codec_id == CODEC_ID_AAC))
|
enc->codec_id == CODEC_ID_AAC))
|
||||||
|
Loading…
x
Reference in New Issue
Block a user