diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-01-10 10:18:35 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-01-10 10:18:35 +0100 |
| commit | 70a65ecabff00a8330a56ceb51b15d10cb5b5389 (patch) | |
| tree | 5d50bdef5dee2f182203f0b4d05e5dad013d37a1 /libavformat/rtpdec_vp8.c | |
| parent | f023003ce610a8fd6377cf4a8e98002ac3117ef4 (diff) | |
| parent | 9a7b56883d1333cdfcdf0fa7584a333841b86114 (diff) | |
| download | ffmpeg-streaming-70a65ecabff00a8330a56ceb51b15d10cb5b5389.zip ffmpeg-streaming-70a65ecabff00a8330a56ceb51b15d10cb5b5389.tar.gz | |
Merge commit '9a7b56883d1333cdfcdf0fa7584a333841b86114'
* commit '9a7b56883d1333cdfcdf0fa7584a333841b86114':
au: set bit rate
au: validate bits-per-sample separately from codec tag
rtpdec_vp8: Mark broken packets with AV_PKT_FLAG_CORRUPT
Conflicts:
libavformat/au.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/rtpdec_vp8.c')
| -rw-r--r-- | libavformat/rtpdec_vp8.c | 5 |
1 files changed, 5 insertions, 0 deletions
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; } |
