diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-10-09 11:04:06 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-10-09 11:04:06 +0200 |
| commit | 7f22df3a49459dc61cd63f4a7329c38bc842f4f3 (patch) | |
| tree | 60f627276d96954bea46abd9a17a9fc6f4a2748a /doc/Makefile | |
| parent | 3aabfaa37b245f86036ea11d82c7c28e5bebde6a (diff) | |
| parent | b2148faca9e9e553c14b27844b56e367c85a777e (diff) | |
| download | ffmpeg-7f22df3a49459dc61cd63f4a7329c38bc842f4f3.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
shorten: Extend fixed_coeffs to properly support pred_order 0
Conflicts:
libavcodec/shorten.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc/Makefile')
0 files changed, 0 insertions, 0 deletions