diff options
| author | Ronald S. Bultje <rsbultje@gmail.com> | 2011-01-20 14:00:34 -0500 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-01-21 20:36:01 +0100 |
| commit | 7f8c11b0052f1f34d8294865c3cb1ec002ebd58e (patch) | |
| tree | 3004c45c031f726076418b979d686e000ba40930 | |
| parent | 772225c041507eba3fd5f9cfcb37d58bfbd579d4 (diff) | |
| download | ffmpeg-7f8c11b0052f1f34d8294865c3cb1ec002ebd58e.tar.gz | |
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)
| -rw-r--r-- | libavcodec/h264_cabac.c | 2 | ||||
| -rw-r--r-- | 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 9c8fc6d232..c83a7c7678 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 b8bc45058c..63d2b3ca34 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]; |