[SCM] libav/experimental: Fix -lowres with ffplay.

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit ba68d9d3e16108cc395ad445e4216621b0758c3d
Author: Anatoly Nenashev <nenashev_as at mail.ru>
Date:   Sun Dec 19 12:17:40 2010 +0000

    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

diff --git a/libavcodec/utils.c b/libavcodec/utils.c
index 69d333e..d82f589 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] =

-- 
Libav/FFmpeg packaging