From: Michael Niedermayer <michaelni@gmx.at>
Date: Sat, 4 Jan 2014 00:35:17 +0000 (+0100)
Subject: Merge commit '1b5d065ca722eb8028c7a08e054b6da3419faf5d'
X-Git-Tag: android-x86-6.0-r1~7973
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=4a055f91bec2f746517ec7757e2b2a3bbdb90027;p=android-x86%2Fexternal-ffmpeg.git

Merge commit '1b5d065ca722eb8028c7a08e054b6da3419faf5d'

* 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>
---

4a055f91bec2f746517ec7757e2b2a3bbdb90027
diff --cc libavformat/pmpdec.c
index 71f450e9d3,8ae147f391..25a5c3e684
--- a/libavformat/pmpdec.c
+++ b/libavformat/pmpdec.c
@@@ -138,10 -124,11 +138,12 @@@ static int pmp_packet(AVFormatContext *
      if (pmp->cur_stream == 0) {
          int num_packets;
          pmp->audio_packets = avio_r8(pb);
++
          if (!pmp->audio_packets) {
-             avpriv_request_sample(s, "0 audio packets");
-             return AVERROR_PATCHWELCOME;
+             av_log(s, AV_LOG_ERROR, "No audio packets.\n");
+             return AVERROR_INVALIDDATA;
          }
+ 
          num_packets = (pmp->num_streams - 1) * pmp->audio_packets + 1;
          avio_skip(pb, 8);
          pmp->current_packet = 0;