diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-21 14:02:02 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-21 14:02:02 +0100 |
| commit | b7e0356cc33297d8db12b56051841f914b6f1ba9 (patch) | |
| tree | c520d2fee090f90cd02b1565dea019c23dabd6df /libavcodec/4xm.c | |
| parent | 6ec279b54c09f47208930021a38a742f2cc09324 (diff) | |
| parent | f69574cf7aca4fe4d57a2155e925f37fc863474d (diff) | |
| download | ffmpeg-b7e0356cc33297d8db12b56051841f914b6f1ba9.tar.gz | |
Merge commit 'f69574cf7aca4fe4d57a2155e925f37fc863474d'
* commit 'f69574cf7aca4fe4d57a2155e925f37fc863474d':
h264: move non_zero_count_cache into the per-slice context
Conflicts:
libavcodec/h264.c
libavcodec/h264_cabac.c
libavcodec/h264_cavlc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/4xm.c')
0 files changed, 0 insertions, 0 deletions