diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-07-13 21:37:47 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-07-13 21:51:20 +0200 |
| commit | cc3e7a4c3df9f6de6f4a2f312355dc221d6380f0 (patch) | |
| tree | b1da90fbc7cb5013fabacba7364f99e5e9403d0c /doc/formats.texi | |
| parent | 98227ba5fa456b5dacd404e125420c9abf87ff95 (diff) | |
| parent | acf91215c74a91eb3b86af01dcb1d3c78d0e2310 (diff) | |
| download | ffmpeg-cc3e7a4c3df9f6de6f4a2f312355dc221d6380f0.tar.gz | |
Merge commit 'acf91215c74a91eb3b86af01dcb1d3c78d0e2310'
* commit 'acf91215c74a91eb3b86af01dcb1d3c78d0e2310':
x86: dsputil: Avoid pointless CONFIG_ENCODERS indirection
Conflicts:
libavcodec/x86/dsputil_init.c
libavcodec/x86/dsputilenc_mmx.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc/formats.texi')
0 files changed, 0 insertions, 0 deletions