diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-09-21 14:25:21 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-09-21 14:44:32 +0200 |
| commit | 406cdddbdd229cead581eb1c7b978a2c59453b24 (patch) | |
| tree | 0c36c4c2fcafb618ae80074a9a1c07a06872a91f /libavformat | |
| parent | 9543cd593ed8249e9885598fc53de163c9d4e2d3 (diff) | |
| parent | e52e4fe10d96da4ed26e2acbe3c1ab69485ed75d (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
libx264: add forgotten ;
matroskadec: fix a sanity check.
matroskadec: only return corrupt packets that actually contain data
lavf: zero data/size of the packet passed to read_packet().
ARM: use 2-operand syntax for ADD Rd, PC in Apple PIC code
ARM: align PIC offset pools to 4 bytes
ARM: swap source operands in some add instructions
configure: update tms470 detection for latest version
lavf probe: prevent codec probe with no data at all seen
motion_est: fix use of inline on extern functions
Conflicts:
libavcodec/motion_est_template.c
libavformat/matroskadec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/matroskadec.c | 2 | ||||
| -rw-r--r-- | libavformat/utils.c | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c index ef2f1748af..a270f0dfc7 100644 --- a/libavformat/matroskadec.c +++ b/libavformat/matroskadec.c @@ -1939,7 +1939,7 @@ static int matroska_parse_laces(MatroskaDemuxContext *matroska, uint8_t **buf, } case 0x2: /* fixed-size lacing */ - if (size != (size / *laces) * *laces) { + if (size % (*laces)) { res = AVERROR_INVALIDDATA; break; } diff --git a/libavformat/utils.c b/libavformat/utils.c index f6a20caa1b..9c607d7307 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -691,6 +691,10 @@ static void probe_codec(AVFormatContext *s, AVStream *st, const AVPacket *pkt) } else { no_packet: st->probe_packets = 0; + if (!pd->buf_size) { + av_log(s, AV_LOG_WARNING, "nothing to probe for stream %d\n", + st->index); + } } end= s->raw_packet_buffer_remaining_size <= 0 @@ -746,6 +750,8 @@ int ff_read_packet(AVFormatContext *s, AVPacket *pkt) } } + pkt->data = NULL; + pkt->size = 0; av_init_packet(pkt); ret= s->iformat->read_packet(s, pkt); if (ret < 0) { |