summaryrefslogtreecommitdiff
path: root/libavcodec/h264_ps.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2011-10-15 15:32:34 +0200
committerMichael Niedermayer <michaelni@gmx.at>2011-10-15 15:38:10 +0200
commit2ed7e353bd8867215bc156c430d4ded7f6774ad4 (patch)
tree58476b31b1a0e8b88a77daa799a781a0d94ebac9 /libavcodec/h264_ps.c
parent1d0afec8fcfaca9736c927715ddd56a5902855ab (diff)
h264: Workaround invalid flag combinations of 8x8 inference.
Fixes Ticket555 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/h264_ps.c')
-rw-r--r--libavcodec/h264_ps.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/libavcodec/h264_ps.c b/libavcodec/h264_ps.c
index 158ca3205a..93697a83c1 100644
--- a/libavcodec/h264_ps.c
+++ b/libavcodec/h264_ps.c
@@ -408,10 +408,6 @@ int ff_h264_decode_seq_parameter_set(H264Context *h){
sps->mb_aff= 0;
sps->direct_8x8_inference_flag= get_bits1(&s->gb);
- if(!sps->frame_mbs_only_flag && !sps->direct_8x8_inference_flag){
- av_log(h->s.avctx, AV_LOG_ERROR, "This stream was generated by a broken encoder, invalid 8x8 inference\n");
- goto fail;
- }
#ifndef ALLOW_INTERLACE
if(sps->mb_aff)