Browse Source

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>
tags/n0.9
Laurent Aimar Anton Khirnov 13 years ago
parent
commit
3e033da847
1 changed files with 2 additions and 1 deletions
  1. +2
    -1
      libavformat/rmdec.c

+ 2
- 1
libavformat/rmdec.c View File

@@ -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);


Loading…
Cancel
Save