generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge commit '1b5d065ca722eb8028c7a08e054b6da3419faf5d'

Browse Source 
* commit '1b5d065ca722eb8028c7a08e054b6da3419faf5d':
  pmpdec: check that there is at least one audio packet.

Conflicts:
	libavformat/pmpdec.c

See: 8b1cd25ca7e64e6128fa2902d78e48bfeeec9786
Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-01-04 01:35:17 +01:00
commit 4a055f91be
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavformat/pmpdec.c
View File

@ -138,10 +138,12 @@ static int pmp_packet(AVFormatContext *s, AVPacket *pkt)
if (pmp->cur_stream == 0) { if (pmp->cur_stream == 0) {
int num_packets; int num_packets;
pmp->audio_packets = avio_r8(pb); pmp->audio_packets = avio_r8(pb);
if (!pmp->audio_packets) { if (!pmp->audio_packets) {
avpriv_request_sample(s, "0 audio packets"); av_log(s, AV_LOG_ERROR, "No audio packets.\n");
return AVERROR_PATCHWELCOME; return AVERROR_INVALIDDATA;
} }
num_packets = (pmp->num_streams - 1) * pmp->audio_packets + 1; num_packets = (pmp->num_streams - 1) * pmp->audio_packets + 1;
avio_skip(pb, 8); avio_skip(pb, 8);
pmp->current_packet = 0; pmp->current_packet = 0;