diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-04-04 15:19:07 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-04-04 15:28:41 +0200 |
| commit | 35617366b581da3e4bbd0557a8fa164ba8406968 (patch) | |
| tree | c325b5f0ff88fcf6a20f756153d1a4d0618c4db0 /libavformat/avformat.h | |
| parent | a20480e6592ec48ca566c8318fe28c4161a7f7ff (diff) | |
| parent | f37815b1d5ee85d266ad27214a71831707111aa8 (diff) | |
| download | ffmpeg-35617366b581da3e4bbd0557a8fa164ba8406968.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
arm: asm decode_block_coeffs_internal is vp8 specific
See: 89f2f5dbd7a23e7ec1073d3c08d46093a01a4135
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/avformat.h')
0 files changed, 0 insertions, 0 deletions