har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'qatar/master'

Browse Source 
* qatar/master:
  h264: informative error reporting in decode_slice_header()

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-02-19 02:24:52 +01:00
commit d0e236292d
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libavcodec/h264.c
View File

@ -3596,8 +3596,12 @@ static int decode_slice_header(H264Context *h, H264Context *h0)
must_reinit || must_reinit ||
needs_reinit)) { needs_reinit)) {
if (h != h0) { if (h != h0) {
av_log(h->avctx, AV_LOG_ERROR, "changing width/height on " av_log(h->avctx, AV_LOG_ERROR,
"slice %d\n", h0->current_slice + 1); "changing width %d -> %d / height %d -> %d on "
"slice %d\n",
h->width, h->avctx->coded_width,
h->height, h->avctx->coded_height,
h0->current_slice + 1);
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
} }