diff options
| author | Timothy Gu <[email protected]> | 2016-08-03 15:59:51 -0700 |
|---|---|---|
| committer | Timothy Gu <[email protected]> | 2016-08-03 15:59:51 -0700 |
| commit | 796027f22154c799e0063e2457b31e0cfd1dddae (patch) | |
| tree | 3f4bfbc1d84c8f3bab88a128ca57dc5adf822e7c /ffmpeg.c | |
| parent | bca30ed2b67f095fd31e07319a622ac30ad22978 (diff) | |
| parent | d1d7678040cd60148f97b372cb4291bcc45b2e22 (diff) | |
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 <[email protected]>
Diffstat (limited to 'ffmpeg.c')
0 files changed, 0 insertions, 0 deletions