diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-08-02 10:45:10 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-08-02 11:00:50 +0200 |
| commit | cb73f84087abe2d5fecaacc199246bacf2f450c8 (patch) | |
| tree | 4f59e8b39b4112bd252cbbe81ac1144e334724ae /libavformat/flvdec.c | |
| parent | ca1b02910889b44720d3937530c0f544c3a4aa2b (diff) | |
| parent | 390b4d7088b5cecace245fee0c54a57e24dabdf4 (diff) | |
| download | ffmpeg-streaming-cb73f84087abe2d5fecaacc199246bacf2f450c8.zip ffmpeg-streaming-cb73f84087abe2d5fecaacc199246bacf2f450c8.tar.gz | |
Merge commit '390b4d7088b5cecace245fee0c54a57e24dabdf4'
* commit '390b4d7088b5cecace245fee0c54a57e24dabdf4':
flvdec: Fix = vs. == typo in sample rate check
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/flvdec.c')
| -rw-r--r-- | libavformat/flvdec.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/flvdec.c b/libavformat/flvdec.c index 69e2bee..21ce0b5 100644 --- a/libavformat/flvdec.c +++ b/libavformat/flvdec.c @@ -122,7 +122,7 @@ static int flv_same_audio_codec(AVCodecContext *acodec, int flags) return acodec->sample_rate == 8000 && acodec->codec_id == AV_CODEC_ID_PCM_MULAW; case FLV_CODECID_PCM_ALAW: - return acodec->sample_rate = 8000 && + return acodec->sample_rate == 8000 && acodec->codec_id == AV_CODEC_ID_PCM_ALAW; default: return acodec->codec_tag == (flv_codecid >> FLV_AUDIO_CODECID_OFFSET); |
