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/mpegvideo.c | |
| parent | ba7d6e798eb11b463852479a5e09a68926e82af6 (diff) | |
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/mpegvideo.c')
| -rw-r--r-- | libavcodec/mpegvideo.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c index 1a2de3a4cb..9650066cee 100644 --- a/libavcodec/mpegvideo.c +++ b/libavcodec/mpegvideo.c @@ -498,7 +498,7 @@ av_cold int MPV_common_init(MpegEncContext *s) if(s->codec_id == CODEC_ID_MPEG2VIDEO && !s->progressive_sequence) s->mb_height = (s->height + 31) / 32 * 2; - else + else if (s->codec_id != CODEC_ID_H264) s->mb_height = (s->height + 15) / 16; if(s->avctx->pix_fmt == PIX_FMT_NONE){ |