diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-02 10:11:35 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-02 10:13:14 +0100 |
| commit | 7146eacfc5f20dea719d6581d72b7532ab39688d (patch) | |
| tree | a79b9e5bb94ac5d34903676518827c577513e261 /libavcodec/webvttdec.c | |
| parent | 0db04ca01dfa34659abc407648bdac507df297f5 (diff) | |
| parent | 1700b4e678ed329611a16b20d11e64b7abda4839 (diff) | |
| download | ffmpeg-7146eacfc5f20dea719d6581d72b7532ab39688d.tar.gz | |
Merge commit '1700b4e678ed329611a16b20d11e64b7abda4839'
* commit '1700b4e678ed329611a16b20d11e64b7abda4839':
x86: vp8dsp: Split loopfilter code into a separate file
Conflicts:
libavcodec/x86/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/webvttdec.c')
0 files changed, 0 insertions, 0 deletions