diff options
| author | Timothy Gu <[email protected]> | 2016-08-03 15:41:59 -0700 |
|---|---|---|
| committer | Timothy Gu <[email protected]> | 2016-08-03 15:41:59 -0700 |
| commit | bca30ed2b67f095fd31e07319a622ac30ad22978 (patch) | |
| tree | ec957ba4fb48112765835398f34b96d23b815a1a /ffmpeg.c | |
| parent | 4be8ab70a628078a5c89e06157bc9f5cb071dda3 (diff) | |
| parent | b13fc1e344011949929975a3451f78f226aa1de3 (diff) | |
Merge commit 'b13fc1e344011949929975a3451f78f226aa1de3'
* commit 'b13fc1e344011949929975a3451f78f226aa1de3':
h264: do not pass H264Context to h264_slice_header_parse()
Conflicts:
libavcodec/h264dec.h
Did not merge the h264_slice_header_parse() part. We use a few other
members of H264Context for error checking in that function.
Merged-by: Timothy Gu <[email protected]>
Diffstat (limited to 'ffmpeg.c')
0 files changed, 0 insertions, 0 deletions