diff options
| author | Michael Niedermayer <[email protected]> | 2015-03-21 21:33:27 +0100 |
|---|---|---|
| committer | Michael Niedermayer <[email protected]> | 2015-03-21 21:33:27 +0100 |
| commit | 8bdcec31116594b07e83a8845b64a5e8172884f2 (patch) | |
| tree | dbeed6cee87d40ab8d9c1ded0df65d7043068846 /libavcodec/avpacket.c | |
| parent | b1e6d8a226524a7477b626e51e4982fc72f295d9 (diff) | |
| parent | 51d8725a6e4c7f989d6f0f38b59cb54a2d72846c (diff) | |
Merge commit '51d8725a6e4c7f989d6f0f38b59cb54a2d72846c'
* commit '51d8725a6e4c7f989d6f0f38b59cb54a2d72846c':
h264: use the main H264Context as the parent for all slice contexts
Conflicts:
libavcodec/h264.c
libavcodec/h264.h
libavcodec/h264_slice.c
Merged-by: Michael Niedermayer <[email protected]>
Diffstat (limited to 'libavcodec/avpacket.c')
0 files changed, 0 insertions, 0 deletions