diff options
| author | Reimar Döffinger <Reimar.Doeffinger@gmx.de> | 2010-11-03 20:52:28 +0000 |
|---|---|---|
| committer | Reimar Döffinger <Reimar.Doeffinger@gmx.de> | 2010-11-03 20:52:28 +0000 |
| commit | 00d1e96bf4fc0467744f840fbc85d1a65cbb6f08 (patch) | |
| tree | f3be21a67732004a616e71b68b8f9de4ef198c8f /libavcodec/h264_ps.c | |
| parent | ba7d6e798eb11b463852479a5e09a68926e82af6 (diff) | |
| download | ffmpeg-00d1e96bf4fc0467744f840fbc85d1a65cbb6f08.tar.gz | |
H.264 decode: support cropping up to 28 pixels in interlaced mode.
Contrary to progressive, just being able to crop up to 14/15 pixels
is not enough to encode all supported resolutions, and the new
behaviour is also consistent with e.g. MPEG-2 etc.
Originally committed as revision 25669 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/h264_ps.c')
| -rw-r--r-- | libavcodec/h264_ps.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/h264_ps.c b/libavcodec/h264_ps.c index d1479289fb..876bcb2a43 100644 --- a/libavcodec/h264_ps.c +++ b/libavcodec/h264_ps.c @@ -373,7 +373,7 @@ int ff_h264_decode_seq_parameter_set(H264Context *h){ if(sps->crop_left || sps->crop_top){ av_log(h->s.avctx, AV_LOG_ERROR, "insane cropping not completely supported, this could look slightly wrong ...\n"); } - if(sps->crop_right >= 8 || sps->crop_bottom >= (8>> !sps->frame_mbs_only_flag)){ + if(sps->crop_right >= 8 || sps->crop_bottom >= 8){ av_log(h->s.avctx, AV_LOG_ERROR, "brainfart cropping not supported, this could look slightly wrong ...\n"); } }else{ |