aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec
diff options
context:
space:
mode:
authorAnatoly Nenashev <nenashev_as@mail.ru>2010-12-19 12:17:40 +0000
committerCarl Eugen Hoyos <cehoyos@rainbow.studorg.tuwien.ac.at>2010-12-19 12:17:40 +0000
commitba68d9d3e16108cc395ad445e4216621b0758c3d (patch)
tree0ca940217a5379cec575fa0566d0eb8ebcd8d69b /libavcodec
parent0bc55f5d32bb348369bfa48041a19b2ff080b8c7 (diff)
downloadffmpeg-ba68d9d3e16108cc395ad445e4216621b0758c3d.tar.gz
Fix -lowres with ffplay.
Patch by Anatoly Nenashev, anatoly d nenashev a ovsoft d ru Originally committed as revision 26057 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/utils.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/utils.c b/libavcodec/utils.c
index 69d333eabc..d82f589181 100644
--- a/libavcodec/utils.c
+++ b/libavcodec/utils.c
@@ -185,8 +185,9 @@ void avcodec_align_dimensions2(AVCodecContext *s, int *width, int *height, int l
*width = FFALIGN(*width , w_align);
*height= FFALIGN(*height, h_align);
- if(s->codec_id == CODEC_ID_H264)
+ if(s->codec_id == CODEC_ID_H264 || s->lowres)
*height+=2; // some of the optimized chroma MC reads one line too much
+ // which is also done in mpeg decoders with lowres > 0
linesize_align[0] =
linesize_align[1] =