diff options
| -rw-r--r-- | libavformat/au.c | 12 | ||||
| -rw-r--r-- | libavformat/rtpdec_vp8.c | 5 |
2 files changed, 15 insertions, 2 deletions
diff --git a/libavformat/au.c b/libavformat/au.c index 2e54a18..6d1d9ab 100644 --- a/libavformat/au.c +++ b/libavformat/au.c @@ -66,10 +66,11 @@ static int au_probe(AVProbeData *p) /* au input */ static int au_read_header(AVFormatContext *s) { - int size, bps, data_size = 0; + int size, data_size = 0; unsigned int tag; AVIOContext *pb = s->pb; unsigned int id, channels, rate; + int bps; enum AVCodecID codec; AVStream *st; @@ -91,7 +92,13 @@ static int au_read_header(AVFormatContext *s) codec = ff_codec_get_id(codec_au_tags, id); - if (!(bps = av_get_bits_per_sample(codec))) { + if (codec == AV_CODEC_ID_NONE) { + av_log_ask_for_sample(s, "unknown or unsupported codec tag: %d\n", id); + return AVERROR_PATCHWELCOME; + } + + bps = av_get_bits_per_sample(codec); + if (!bps) { av_log_ask_for_sample(s, "could not determine bits per sample\n"); return AVERROR_PATCHWELCOME; } @@ -115,6 +122,7 @@ static int au_read_header(AVFormatContext *s) st->codec->codec_id = codec; st->codec->channels = channels; st->codec->sample_rate = rate; + st->codec->bit_rate = channels * rate * bps; st->codec->block_align = FFMAX(bps * st->codec->channels / 8, 1); if (data_size != AU_UNKNOWN_SIZE) st->duration = (((int64_t)data_size)<<3) / (st->codec->channels * (int64_t)bps); diff --git a/libavformat/rtpdec_vp8.c b/libavformat/rtpdec_vp8.c index 9d6a697..6f4e4e0 100644 --- a/libavformat/rtpdec_vp8.c +++ b/libavformat/rtpdec_vp8.c @@ -90,6 +90,8 @@ static int vp8_handle_packet(AVFormatContext *ctx, PayloadContext *vp8, if (ret < 0) return ret; *timestamp = vp8->timestamp; + if (vp8->sequence_dirty) + pkt->flags |= AV_PKT_FLAG_CORRUPT; return 0; } return AVERROR(EAGAIN); @@ -199,6 +201,7 @@ static int vp8_handle_packet(AVFormatContext *ctx, PayloadContext *vp8, if (ret < 0) return ret; pkt->size = vp8->first_part_size; + pkt->flags |= AV_PKT_FLAG_CORRUPT; returned_old_frame = 1; old_timestamp = vp8->timestamp; } else { @@ -261,6 +264,8 @@ static int vp8_handle_packet(AVFormatContext *ctx, PayloadContext *vp8, return ret; if (vp8->broken_frame) pkt->size = vp8->first_part_size; + if (vp8->sequence_dirty) + pkt->flags |= AV_PKT_FLAG_CORRUPT; return 0; } |
