diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-01-12 16:01:50 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-01-12 16:08:27 +0100 |
| commit | 7e343798976991f4320c1c90b8d4fac4c2f9e355 (patch) | |
| tree | 4ffd20dd9efa6411a71f46c4eec21819af6ee3dc /libavformat/pmpdec.c | |
| parent | ce795ac0f53e4c2e50667ac1bef38b82e945e96d (diff) | |
| parent | 0e8ae6d10c609bb968c141aa2436413a55852590 (diff) | |
| download | ffmpeg-7e343798976991f4320c1c90b8d4fac4c2f9e355.tar.gz | |
Merge commit '0e8ae6d10c609bb968c141aa2436413a55852590' into release/1.1
* commit '0e8ae6d10c609bb968c141aa2436413a55852590':
mpegvideo: Drop a faulty assert
lavr: check that current_buffer is not NULL before using it
pmpdec: check that there is at least one audio packet.
lzw: switch to bytestream2
gifdec: convert to bytestream2
Conflicts:
libavcodec/gifdec.c
libavcodec/lzw.c
libavcodec/lzw.h
libavformat/pmpdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/pmpdec.c')
| -rw-r--r-- | libavformat/pmpdec.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libavformat/pmpdec.c b/libavformat/pmpdec.c index 2ea37ef030..cfac3344c4 100644 --- a/libavformat/pmpdec.c +++ b/libavformat/pmpdec.c @@ -125,9 +125,10 @@ static int pmp_packet(AVFormatContext *s, AVPacket *pkt) int num_packets; pmp->audio_packets = avio_r8(pb); if (!pmp->audio_packets) { - av_log_ask_for_sample(s, "0 audio packets\n"); - 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; |