[FFmpeg-cvslog] Set gray (128) U/V planes for chroma-less samples. Fixes two fate samples

Ronald S. Bultje git
Fri Jan 21 20:40:03 CET 2011


ffmpeg | branch: master | Ronald S. Bultje <rsbultje at gmail.com> | Thu Jan 20 14:00:34 2011 -0500| [7f8c11b0052f1f34d8294865c3cb1ec002ebd58e] | committer: Michael Niedermayer

Set gray (128) U/V planes for chroma-less samples. Fixes two fate samples
when played with -flags emu_edge.
(cherry picked from commit 8bcfe7f7fd71e5d548c2cd96d33295ff06a5f6c8)

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7f8c11b0052f1f34d8294865c3cb1ec002ebd58e
---

 libavcodec/h264_cabac.c |    2 ++
 libavcodec/h264_cavlc.c |    2 ++
 2 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/libavcodec/h264_cabac.c b/libavcodec/h264_cabac.c
index 9c8fc6d..c83a7c7 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 b8bc450..63d2b3c 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];




More information about the ffmpeg-cvslog mailing list