diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-07 03:09:32 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-07 03:10:13 +0100 |
| commit | c9fef27deb992066c27255e22bb906015858a098 (patch) | |
| tree | 055d22e84a4f5a55aa64b5e62aa0359937bd867d /MAINTAINERS | |
| parent | 08dde7567dea076363e3b9f3d02a738390a698fa (diff) | |
| parent | 8883b5f85bfe35509633bc590d19b6a1b495690e (diff) | |
| download | ffmpeg-c9fef27deb992066c27255e22bb906015858a098.tar.gz | |
Merge commit '8883b5f85bfe35509633bc590d19b6a1b495690e' into release/1.1
* commit '8883b5f85bfe35509633bc590d19b6a1b495690e':
h264: Fix a typo from the previous commit
h264: Lower bound check for slice offsets
Add missing header to fix compilation after d2a0654
Prepare for 9.12 RELEASE
configure: Add missing dependency of Snow decoder on videodsp
rpza: limit the number of blocks to the total remaining blocks in the frame
Conflicts:
RELEASE
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'MAINTAINERS')
0 files changed, 0 insertions, 0 deletions