diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2010-02-07 15:12:37 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2010-02-07 15:12:37 +0000 |
| commit | 1c3ce2cd3ef3df47eccb0245017a6d2f3d5308b4 (patch) | |
| tree | 7c0d866aa26697726a65a568899e91b199f2555b /libavcodec/h264_ps.c | |
| parent | 33a6c0c9fec1e31bf3dd50019f8587abed70b55e (diff) | |
Check direct_8x8_inference_flag.
Originally committed as revision 21668 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/h264_ps.c')
| -rw-r--r-- | libavcodec/h264_ps.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/libavcodec/h264_ps.c b/libavcodec/h264_ps.c index 6b9e6e9427..0c4083fbae 100644 --- a/libavcodec/h264_ps.c +++ b/libavcodec/h264_ps.c @@ -347,6 +347,10 @@ 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) |