diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-21 14:38:59 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-21 14:38:59 +0100 |
| commit | a8ac4c9b06b9f3ee73ef377a3e4392957c72c2b3 (patch) | |
| tree | fb5114ebcffba281026acf7503aba6aa8212da8b /MAINTAINERS | |
| parent | 4ffbeddd35cb6a365a3db85bb2bdf2084fb1ba55 (diff) | |
| parent | 066aafced4dc6c7c9e7b37082635472249f1e93e (diff) | |
| download | ffmpeg-a8ac4c9b06b9f3ee73ef377a3e4392957c72c2b3.tar.gz | |
Merge commit '066aafced4dc6c7c9e7b37082635472249f1e93e'
* commit '066aafced4dc6c7c9e7b37082635472249f1e93e':
h264: move direct_spatial_mv_pred into the per-slice context
Conflicts:
libavcodec/h264_mvpred.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'MAINTAINERS')
0 files changed, 0 insertions, 0 deletions