diff options
| author | Michael Niedermayer <[email protected]> | 2015-03-21 18:07:01 +0100 |
|---|---|---|
| committer | Michael Niedermayer <[email protected]> | 2015-03-21 18:07:01 +0100 |
| commit | 9d0450ae943a7d1071fa59bfd0c4f7647d733c5f (patch) | |
| tree | d1ebfb43b856fa79589c3e67580e7e6deb631c1b /cmdutils.c | |
| parent | d511dc653062502ac7a86d9ef47ffeabd6f77364 (diff) | |
| parent | e9b2383bf86b38ad18a001801aee20c8182e29bd (diff) | |
Merge commit 'e9b2383bf86b38ad18a001801aee20c8182e29bd'
* commit 'e9b2383bf86b38ad18a001801aee20c8182e29bd':
h264: move mb_mbaff into the per-slice context
Conflicts:
libavcodec/h264_cabac.c
libavcodec/h264_cavlc.c
libavcodec/h264_slice.c
Merged-by: Michael Niedermayer <[email protected]>
Diffstat (limited to 'cmdutils.c')
0 files changed, 0 insertions, 0 deletions