Changeset 4177f501 in ffmpeg
- Timestamp:
- Feb 14, 2015, 7:29:34 PM (10 years ago)
- Branches:
- master
- Children:
- 088dfd3f
- Parents:
- 3eec775b (diff), 7769be59 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the(diff)
links above to see all the changes relative to each parent. - File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
libavcodec/vp56.c
r3eec775b r4177f501 474 474 ff_set_dimensions(avctx, 0, 0); 475 475 av_log(avctx, AV_LOG_ERROR, "picture too big\n"); 476 return -1;476 return AVERROR_INVALIDDATA; 477 477 } 478 478 … … 510 510 if (s->has_alpha) { 511 511 if (remaining_buf_size < 3) 512 return -1;512 return AVERROR_INVALIDDATA; 513 513 alpha_offset = bytestream_get_be24(&buf); 514 514 remaining_buf_size -= 3; 515 515 if (remaining_buf_size < alpha_offset) 516 return -1;516 return AVERROR_INVALIDDATA; 517 517 } 518 518 … … 529 529 } 530 530 531 if (ff_get_buffer(avctx, p, AV_GET_BUFFER_FLAG_REF) < 0) 532 return -1; 531 ret = ff_get_buffer(avctx, p, AV_GET_BUFFER_FLAG_REF); 532 if (ret < 0) 533 return ret; 533 534 534 535 if (avctx->pix_fmt == AV_PIX_FMT_YUVA420P) { … … 543 544 if (vp56_size_changed(s)) { 544 545 av_frame_unref(p); 545 return -1;546 return AVERROR_INVALIDDATA; 546 547 } 547 548 } … … 565 566 } 566 567 av_frame_unref(p); 567 return -1;568 return AVERROR_INVALIDDATA; 568 569 } 569 570 }
Note:
See TracChangeset
for help on using the changeset viewer.