diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-01-18 21:37:39 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-01-18 21:44:18 +0100 |
| commit | f2cb3b36aca220a05ddb797e2d9c220613a3755f (patch) | |
| tree | b2fe2b19fcc620be0be06215e0090d9f0d781284 /libavcodec | |
| parent | 357a733f91ac96d5806856b83081f3f7dace01fe (diff) | |
| parent | 7f0e81db3c4ee6f8ce15058bafa72ce928a89f3f (diff) | |
| download | ffmpeg-f2cb3b36aca220a05ddb797e2d9c220613a3755f.tar.gz | |
Merge commit '7f0e81db3c4ee6f8ce15058bafa72ce928a89f3f'
* commit '7f0e81db3c4ee6f8ce15058bafa72ce928a89f3f':
h264: limit allowed pred modes in ff_h264_check_intra_pred_mode() to 3
Conflicts:
libavcodec/h264.c
See: d6a33f5d20b6ef2eae2cbb959b001cb125a564b7
See: 2005fddcbb4e18e8f7c34326e40609e4a2d83c31
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/h264.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/h264.c b/libavcodec/h264.c index 3c5e8e99d3..b749c77b93 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -566,7 +566,7 @@ int ff_h264_check_intra4x4_pred_mode(H264Context *h) int ff_h264_check_intra_pred_mode(H264Context *h, int mode, int is_chroma) { static const int8_t top[4] = { LEFT_DC_PRED8x8, 1, -1, -1 }; - static const int8_t left[5] = { TOP_DC_PRED8x8, -1, 2, -1, DC_128_PRED8x8 }; + static const int8_t left[5] = { TOP_DC_PRED8x8, -1, 2, -1, DC_128_PRED8x8 }; if (mode > 3U) { av_log(h->avctx, AV_LOG_ERROR, |