diff options
| author | Laurent Aimar <fenrir@videolan.org> | 2011-09-17 21:17:45 +0000 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2011-09-19 12:37:31 +0200 |
| commit | 3e033da84782e12ed529e6a88dd53b6a72199e8e (patch) | |
| tree | 165fca03ce0df87d531c78b2969690dcd2636c26 /libavformat | |
| parent | 63d64228a7f31d534e3bcae87cbd37f4a0ae2dd6 (diff) | |
| download | ffmpeg-3e033da84782e12ed529e6a88dd53b6a72199e8e.tar.gz | |
rmdec: use the deinterleaving mode and not the codec when creating audio packets.
It prevents crashes due to non initialized fields.
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/rmdec.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavformat/rmdec.c b/libavformat/rmdec.c index 02ff7e93f0..4b891817af 100644 --- a/libavformat/rmdec.c +++ b/libavformat/rmdec.c @@ -813,7 +813,8 @@ ff_rm_retrieve_cache (AVFormatContext *s, AVIOContext *pb, assert (rm->audio_pkt_cnt > 0); - if (st->codec->codec_id == CODEC_ID_AAC) + if (ast->deint_id == DEINT_ID_VBRF || + ast->deint_id == DEINT_ID_VBRS) av_get_packet(pb, pkt, ast->sub_packet_lengths[ast->sub_packet_cnt - rm->audio_pkt_cnt]); else { av_new_packet(pkt, st->codec->block_align); |