[SCM] libav/experimental: Set gray (128) U/V planes for chroma-less samples. Fixes two fate samples when played with -flags emu_edge.

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 8bcfe7f7fd71e5d548c2cd96d33295ff06a5f6c8
Author: Ronald S. Bultje <rsbultje at gmail.com>
Date:   Thu Jan 20 14:00:34 2011 -0500

    Set gray (128) U/V planes for chroma-less samples. Fixes two fate samples
    when played with -flags emu_edge.

diff --git a/libavcodec/h264_cabac.c b/libavcodec/h264_cabac.c
index 5aad4d7..efc2b71 100644
--- a/libavcodec/h264_cabac.c
+++ b/libavcodec/h264_cabac.c
@@ -1373,6 +1373,8 @@ decode_intra_mb:
             pred_mode= ff_h264_check_intra_pred_mode( h, pred_mode );
             if( pred_mode < 0 ) return -1;
             h->chroma_pred_mode= pred_mode;
+        } else {
+            h->chroma_pred_mode= DC_128_PRED8x8;
         }
     } else if( partition_count == 4 ) {
         int i, j, sub_partition_count[4], list, ref[2][4];
diff --git a/libavcodec/h264_cavlc.c b/libavcodec/h264_cavlc.c
index 55ff022..c9d28d0 100644
--- a/libavcodec/h264_cavlc.c
+++ b/libavcodec/h264_cavlc.c
@@ -665,6 +665,8 @@ decode_intra_mb:
             if(pred_mode < 0)
                 return -1;
             h->chroma_pred_mode= pred_mode;
+        } else {
+            h->chroma_pred_mode = DC_128_PRED8x8;
         }
     }else if(partition_count==4){
         int i, j, sub_partition_count[4], list, ref[2][4];

-- 
Libav/FFmpeg packaging