diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-21 14:03:14 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-21 14:06:30 +0100 |
| commit | f1436a7f961519f2f149c5eda72af988004f4483 (patch) | |
| tree | 1a9cb91a6f0653ab1399ce6757288b744bb6e370 /libavcodec/dvbsub.c | |
| parent | b7e0356cc33297d8db12b56051841f914b6f1ba9 (diff) | |
| parent | e6287f077c3e8e4aca11e61dd4bade1351439e6b (diff) | |
| download | ffmpeg-f1436a7f961519f2f149c5eda72af988004f4483.tar.gz | |
Merge commit 'e6287f077c3e8e4aca11e61dd4bade1351439e6b'
* commit 'e6287f077c3e8e4aca11e61dd4bade1351439e6b':
h264: move {mv,ref}_cache into the per-slice context
Conflicts:
libavcodec/h264_cabac.c
libavcodec/h264_mb.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/dvbsub.c')
0 files changed, 0 insertions, 0 deletions