Commit cb73f840 authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit '390b4d70'

* commit '390b4d70':
  flvdec: Fix = vs. == typo in sample rate check
Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents ca1b0291 390b4d70
...@@ -122,7 +122,7 @@ static int flv_same_audio_codec(AVCodecContext *acodec, int flags) ...@@ -122,7 +122,7 @@ static int flv_same_audio_codec(AVCodecContext *acodec, int flags)
return acodec->sample_rate == 8000 && return acodec->sample_rate == 8000 &&
acodec->codec_id == AV_CODEC_ID_PCM_MULAW; acodec->codec_id == AV_CODEC_ID_PCM_MULAW;
case FLV_CODECID_PCM_ALAW: case FLV_CODECID_PCM_ALAW:
return acodec->sample_rate = 8000 && return acodec->sample_rate == 8000 &&
acodec->codec_id == AV_CODEC_ID_PCM_ALAW; acodec->codec_id == AV_CODEC_ID_PCM_ALAW;
default: default:
return acodec->codec_tag == (flv_codecid >> FLV_AUDIO_CODECID_OFFSET); return acodec->codec_tag == (flv_codecid >> FLV_AUDIO_CODECID_OFFSET);
......
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