diff options
| author | Baptiste Coudurier <baptiste.coudurier@gmail.com> | 2008-08-29 22:13:22 +0000 |
|---|---|---|
| committer | Baptiste Coudurier <baptiste.coudurier@gmail.com> | 2008-08-29 22:13:22 +0000 |
| commit | ca9c5a4d3768b986da537b16530906d3a553e881 (patch) | |
| tree | 84903f9f85994da6dcb65f3f66afee292b4cc96d /libavformat/utils.c | |
| parent | ae58b54b3f81963f7f7a952281a5983626adad07 (diff) | |
| download | ffmpeg-ca9c5a4d3768b986da537b16530906d3a553e881.tar.gz | |
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
Diffstat (limited to 'libavformat/utils.c')
| -rw-r--r-- | libavformat/utils.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/utils.c b/libavformat/utils.c index ee6a71e439..c4ebf2087b 100644 --- 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)) |