diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-01-24 06:21:45 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-01-24 15:36:38 +0100 |
| commit | beb19a044420e2765af6aa4fb8a70f3bde0c9106 (patch) | |
| tree | c76c73fd6806c2da762adf7b25fd159bc7d82a00 | |
| parent | b2be1dabb194efe911c5c3015ba322e32701f009 (diff) | |
| download | ffmpeg-beb19a044420e2765af6aa4fb8a70f3bde0c9106.tar.gz | |
h264: Disallow w/h/pixfmt changes for frame threads.
Previously this was just checked in case of slice threads,
but frame threads do not support this either currently.
Making them support this is of course the long term goal
Fixes bug155
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/h264.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/h264.c b/libavcodec/h264.c index b65fdeb5e3..2b18b06f69 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -2727,7 +2727,7 @@ static int decode_slice_header(H264Context *h, H264Context *h0){ || s->avctx->bits_per_raw_sample != h->sps.bit_depth_luma || h->cur_chroma_format_idc != h->sps.chroma_format_idc || av_cmp_q(h->sps.sar, s->avctx->sample_aspect_ratio))) { - if(h != h0) { + if(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 is", 0); return -1; // width / height changed during parallelized decoding } |