diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-07-17 21:55:37 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-07-17 22:07:52 +0200 |
| commit | d6676a16057576e1a0ee66ae89963ec54f632919 (patch) | |
| tree | 3a1dd254d3034f02eba26cc4bee75a6f8e723516 /libavcodec/pnmenc.c | |
| parent | 8e2976860ffc920e31e0c45bb1361ac3a552cae8 (diff) | |
| parent | c23ce454b3e33634a188d6facfd2b7182af5af93 (diff) | |
| download | ffmpeg-d6676a16057576e1a0ee66ae89963ec54f632919.tar.gz | |
Merge commit 'c23ce454b3e33634a188d6facfd2b7182af5af93'
* commit 'c23ce454b3e33634a188d6facfd2b7182af5af93':
x86: dsputil: Coalesce all init files
Conflicts:
libavcodec/x86/dsputil_init.c
libavcodec/x86/dsputil_x86.h
libavcodec/x86/motion_est.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/pnmenc.c')
0 files changed, 0 insertions, 0 deletions