diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-02-04 16:10:24 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-02-04 16:14:30 +0100 |
| commit | 9a082fec1af547f0e777a55186fdd7887d7dfa0d (patch) | |
| tree | ee097b0d384b20f6f9fc9ebdf43c031c056baee4 /libavformat/mms.c | |
| parent | c18cfd1001e012135211630612be6079ba627ace (diff) | |
| parent | e46ad30a808744ddf3855567e162292a4eaabac7 (diff) | |
| download | ffmpeg-9a082fec1af547f0e777a55186fdd7887d7dfa0d.tar.gz | |
Merge commit 'e46ad30a808744ddf3855567e162292a4eaabac7'
* commit 'e46ad30a808744ddf3855567e162292a4eaabac7':
vp8: use a fixed-size edge emu buffer
Conflicts:
libavcodec/vp8.c
libavcodec/vp8.h
See: face578d56c2d1375e40d5e2a28acc122132bc55
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/mms.c')
0 files changed, 0 insertions, 0 deletions