diff options
| author | Timothy Gu <timothygu99@gmail.com> | 2016-08-03 15:59:51 -0700 |
|---|---|---|
| committer | Timothy Gu <timothygu99@gmail.com> | 2016-08-03 15:59:51 -0700 |
| commit | 796027f22154c799e0063e2457b31e0cfd1dddae (patch) | |
| tree | 3f4bfbc1d84c8f3bab88a128ca57dc5adf822e7c /libavcodec/h264dec.h | |
| parent | bca30ed2b67f095fd31e07319a622ac30ad22978 (diff) | |
| parent | d1d7678040cd60148f97b372cb4291bcc45b2e22 (diff) | |
| download | ffmpeg-796027f22154c799e0063e2457b31e0cfd1dddae.tar.gz | |
Merge commit 'd1d7678040cd60148f97b372cb4291bcc45b2e22'
* commit 'd1d7678040cd60148f97b372cb4291bcc45b2e22':
h264: fix the check for mixed IDR/non-IDR slices
Conflicts:
libavcodec/h264_slice.c
libavcodec/h264dec.c
Merged-by: Timothy Gu <timothygu99@gmail.com>
Diffstat (limited to 'libavcodec/h264dec.h')
| -rw-r--r-- | libavcodec/h264dec.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/libavcodec/h264dec.h b/libavcodec/h264dec.h index 9483efbc43..3034a933c2 100644 --- a/libavcodec/h264dec.h +++ b/libavcodec/h264dec.h @@ -384,6 +384,11 @@ typedef struct H264Context { */ int postpone_filter; + /* + * Set to 1 when the current picture is IDR, 0 otherwise. + */ + int picture_idr; + int8_t(*intra4x4_pred_mode); H264PredContext hpc; |