Merge commit '32c8d89c036b0e75ece74aea638df587099def0b'

* commit '32c8d89c036b0e75ece74aea638df587099def0b':
  hevc: Print the non-supported chroma_format_idc

Conflicts:
	libavcodec/hevc_ps.c

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer 2015-07-14 01:33:58 +02:00
commit 3edc6d1cd9

View File

@ -773,6 +773,9 @@ static int map_pixel_format(AVCodecContext *avctx, HEVCSPS *sps)
default:
av_log(avctx, AV_LOG_ERROR,
"4:2:0, 4:2:2, 4:4:4 supports are currently specified for 8, 10 and 12 bits.\n");
av_log(avctx, AV_LOG_ERROR,
"chroma_format_idc is %d",
sps->chroma_format_idc);
return AVERROR_INVALIDDATA;
}