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.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.c')
| -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 6c2cdf8174..f99f7ea6ad 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -1810,7 +1810,7 @@ static int decode_slice_header(H264Context *h, H264Context *h0){ if(h->sps.frame_mbs_only_flag) s->height= 16*s->mb_height - 2*FFMIN(h->sps.crop_bottom, 7); else - s->height= 16*s->mb_height - 4*FFMIN(h->sps.crop_bottom, 3); + s->height= 16*s->mb_height - 4*FFMIN(h->sps.crop_bottom, 7); if (s->context_initialized && ( s->width != s->avctx->width || s->height != s->avctx->height |