[SCM] libav/experimental: Fix a yuv420p sample that was incorrectly detected as yuv411p (576i50 25Mbps 4:1:1 special case was wrong). Fixes issue2211

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit e2f0214a0bf42558b565f7706e916f569fce23b8
Author: Niobos <niobos at dest-unreach.be>
Date:   Thu Sep 30 12:26:42 2010 +0000

    Fix a yuv420p sample that was incorrectly detected as yuv411p
    (576i50 25Mbps 4:1:1 special case was wrong).
    Fixes issue2211
    
    Patch by Niobos, niobos dest-unreach be
    
    Originally committed as revision 25269 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/dvdata.c b/libavcodec/dvdata.c
index e7c377a..05993d8 100644
--- a/libavcodec/dvdata.c
+++ b/libavcodec/dvdata.c
@@ -255,7 +255,7 @@ const DVprofile* ff_dv_frame_profile(const DVprofile *sys,
    int stype = frame[80*5 + 48 + 3] & 0x1f;
 
    /* 576i50 25Mbps 4:1:1 is a special case */
-   if (dsf == 1 && stype == 0 && frame[5] & 0x07) {
+   if (dsf == 1 && stype == 0 && frame[4] & 0x07 /* the APT field */) {
        return &dv_profiles[2];
    }
 

-- 
Libav/FFmpeg packaging