diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-07-07 02:17:30 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-07-07 02:17:30 +0200 |
| commit | 46a47077eee2d7755e17f6557903f383cdfe1b8b (patch) | |
| tree | 2f42fe2b5bcd4f3e71a24bc9126ce73ecc665a74 /libavformat/flvdec.c | |
| parent | a6da14ec3cbe009b2f6fe3eaaa4865e8c8f5ef1a (diff) | |
| parent | 5adc829eb0787682111ca063bfc2b31558999dff (diff) | |
| download | ffmpeg-46a47077eee2d7755e17f6557903f383cdfe1b8b.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
configure: add functions for testing code fragments
af_amix: avoid spurious EAGAIN.
af_amix: return AVERROR(EAGAIN) when request_frame didn't produce output.
af_amix: only consider negative return codes as errors.
avconv: use only meaningful timestamps in start time check.
avconv: fix the check for -ss as an output option.
mss3: add forgotten 'static' qualifier for private table
lavc: options: add planar names for request_sample_fmt
flacdec: add planar output support
flvdec: Treat all nellymoser versions as the same codec
Conflicts:
ffmpeg.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/flvdec.c')
| -rw-r--r-- | libavformat/flvdec.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/libavformat/flvdec.c b/libavformat/flvdec.c index b65af892fb..997824dcec 100644 --- a/libavformat/flvdec.c +++ b/libavformat/flvdec.c @@ -113,11 +113,7 @@ static int flv_same_audio_codec(AVCodecContext *acodec, int flags) case FLV_CODECID_MP3: return acodec->codec_id == CODEC_ID_MP3; case FLV_CODECID_NELLYMOSER_8KHZ_MONO: - return acodec->sample_rate == 8000 && - acodec->codec_id == CODEC_ID_NELLYMOSER; case FLV_CODECID_NELLYMOSER_16KHZ_MONO: - return acodec->sample_rate == 16000 && - acodec->codec_id == CODEC_ID_NELLYMOSER; case FLV_CODECID_NELLYMOSER: return acodec->codec_id == CODEC_ID_NELLYMOSER; case FLV_CODECID_PCM_MULAW: |