mm.c (libav-12) | : | mm.c (libav-12.1) | ||
---|---|---|---|---|
skipping to change at line 177 | skipping to change at line 177 | |||
if (avio_read(pb, pkt->data + MM_PREAMBLE_SIZE, length) != length) | if (avio_read(pb, pkt->data + MM_PREAMBLE_SIZE, length) != length) | |||
return AVERROR(EIO); | return AVERROR(EIO); | |||
pkt->size = length + MM_PREAMBLE_SIZE; | pkt->size = length + MM_PREAMBLE_SIZE; | |||
pkt->stream_index = 0; | pkt->stream_index = 0; | |||
pkt->pts = mm->video_pts; | pkt->pts = mm->video_pts; | |||
if (type!=MM_TYPE_PALETTE) | if (type!=MM_TYPE_PALETTE) | |||
mm->video_pts++; | mm->video_pts++; | |||
return 0; | return 0; | |||
case MM_TYPE_AUDIO : | case MM_TYPE_AUDIO : | |||
if (s->nb_streams != 2) { | ||||
av_log(s, AV_LOG_ERROR, | ||||
"Unexpected audio packet, skipping\n"); | ||||
avio_skip(pb, length); | ||||
return AVERROR_INVALIDDATA; | ||||
} | ||||
if (av_get_packet(s->pb, pkt, length)<0) | if (av_get_packet(s->pb, pkt, length)<0) | |||
return AVERROR(ENOMEM); | return AVERROR(ENOMEM); | |||
pkt->size = length; | pkt->size = length; | |||
pkt->stream_index = 1; | pkt->stream_index = 1; | |||
pkt->pts = mm->audio_pts++; | pkt->pts = mm->audio_pts++; | |||
return 0; | return 0; | |||
default : | default : | |||
av_log(s, AV_LOG_INFO, "unknown chunk type 0x%x\n", type); | av_log(s, AV_LOG_INFO, "unknown chunk type 0x%x\n", type); | |||
avio_skip(pb, length); | avio_skip(pb, length); | |||
End of changes. 1 change blocks. | ||||
0 lines changed or deleted | 6 lines changed or added |