summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-12-19 20:11:41 +0100
committerMichael Niedermayer <michaelni@gmx.at>2012-12-19 21:46:11 +0100
commite33811bd2686411233cb0eb4a4ee45eb99d7e736 (patch)
treef86a92a0a7132452cde425968f09e0b8782b3589
parentc2dfb1e37cc72bf144545c4410a4621cbff5c4b1 (diff)
h264: remove reschange blocking
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--libavcodec/h264.c5
1 files changed, 0 insertions, 5 deletions
diff --git a/libavcodec/h264.c b/libavcodec/h264.c
index cb19617d99..b63fe9c318 100644
--- a/libavcodec/h264.c
+++ b/libavcodec/h264.c
@@ -2743,11 +2743,6 @@ static int decode_slice_header(H264Context *h, H264Context *h0)
|| h->cur_chroma_format_idc != h->sps.chroma_format_idc
|| av_cmp_q(h->sps.sar, s->avctx->sample_aspect_ratio)));
- if(must_reinit && (h != h0 || (s->avctx->active_thread_type & FF_THREAD_FRAME))) {
- av_log_missing_feature(s->avctx,
- "Width/height/bit depth/chroma idc changing with threads", 0);
- return AVERROR_PATCHWELCOME; // width / height changed during parallelized decoding
- }
s->mb_width = h->sps.mb_width;
s->mb_height = h->sps.mb_height * (2 - h->sps.frame_mbs_only_flag);