diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-21 15:45:44 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-21 15:45:44 +0100 |
| commit | f5d4d618242f412626f65e5f9b5a069448bf219b (patch) | |
| tree | e32a6ffc0d136b365026e6ed1ca55252f8c856be /libavcodec/h264_cavlc.c | |
| parent | d86e8f235e59e1f5f49fda8eeabd69bfb8396549 (diff) | |
| parent | 30da98adbda6de1f55188f9058a3a5c715049633 (diff) | |
| download | ffmpeg-f5d4d618242f412626f65e5f9b5a069448bf219b.tar.gz | |
Merge commit '30da98adbda6de1f55188f9058a3a5c715049633'
* commit '30da98adbda6de1f55188f9058a3a5c715049633':
h264: move cabac[_state] into the per-slice context
Conflicts:
libavcodec/h264_cabac.c
libavcodec/h264_slice.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/h264_cavlc.c')
0 files changed, 0 insertions, 0 deletions