highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avcodec/h264_slice: Make setup_finished check cover more cases

Browse Source
This commit is contained in:
Michael Niedermayer
2016-07-27 18:22:41 +02:00
parent ad14aab3b4
commit 8385e1718e
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
libavcodec/h264_slice.c
View File

@@ -1560,12 +1560,15 @@ int ff_h264_decode_slice_header(H264Context *h, H264SliceContext *sl,
if (ret < 0) if (ret < 0)
return ret; return ret;
if (sl->first_mb_addr == 0 || !h->current_slice) {
if (h->setup_finished) {
av_log(h->avctx, AV_LOG_ERROR, "Too many fields\n");
return AVERROR_INVALIDDATA;
}
}
if (sl->first_mb_addr == 0) { // FIXME better field boundary detection if (sl->first_mb_addr == 0) { // FIXME better field boundary detection
if (h->current_slice) { if (h->current_slice) {
if (h->setup_finished) {
av_log(h->avctx, AV_LOG_ERROR, "Too many fields\n");
return AVERROR_INVALIDDATA;
}
if (h->max_contexts > 1) { if (h->max_contexts > 1) {
if (!h->single_decode_warning) { if (!h->single_decode_warning) {
av_log(h->avctx, AV_LOG_WARNING, "Cannot decode multiple access units as slice threads\n"); av_log(h->avctx, AV_LOG_WARNING, "Cannot decode multiple access units as slice threads\n");