diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-05-25 00:38:16 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-05-25 00:38:16 +0200 |
| commit | 65e63072f81641f50e5775be5c3b2873e8d6f38e (patch) | |
| tree | 766617aff5fadbb6bee949ee7669c9431d00a374 /libavformat/flvdec.c | |
| parent | ba4aa656ce1c4e530bec4ed1b0fcf67eb20283f0 (diff) | |
| parent | a4d3f3580bd993f4e8f4abc9c4ad486cb1c51987 (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
rtmp: Return a proper error code instead of -1
rtmp: Check malloc calls
rtmp: Check ff_rtmp_packet_create calls
lavfi: add audio mix filter
flvdec: Make sure sample_rate is set to the updated value
tqi: Pass errors from the MB decoder
Conflicts:
Changelog
doc/filters.texi
libavcodec/eatqi.c
libavfilter/Makefile
libavfilter/allfilters.c
libavfilter/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/flvdec.c')
| -rw-r--r-- | libavformat/flvdec.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavformat/flvdec.c b/libavformat/flvdec.c index d4cc7b9a83..e626999519 100644 --- a/libavformat/flvdec.c +++ b/libavformat/flvdec.c @@ -591,8 +591,8 @@ static int flv_read_packet(AVFormatContext *s, AVPacket *pkt) } if(!st->codec->codec_id){ flv_set_audio_codec(s, st, st->codec, flags & FLV_AUDIO_CODECID_MASK); - flv->last_sample_rate = st->codec->sample_rate; - flv->last_channels = st->codec->channels; + flv->last_sample_rate = sample_rate = st->codec->sample_rate; + flv->last_channels = channels = st->codec->channels; } else { AVCodecContext ctx; ctx.sample_rate = sample_rate; |