diff options
| author | Michael Niedermayer <[email protected]> | 2014-07-10 00:56:05 +0200 |
|---|---|---|
| committer | Michael Niedermayer <[email protected]> | 2014-07-10 01:22:14 +0200 |
| commit | 2d5e9451de3c7ab00cac6ec4aff290e12a2f190d (patch) | |
| tree | 9934a09e3ad1f63796274ee59f216df19cd9ca02 /cmdutils_common_opts.h | |
| parent | 6cc1fec41263add956b35af96d7c4a81c9436a65 (diff) | |
| parent | f46bb608d9d76c543e4929dc8cffe36b84bd789e (diff) | |
Merge commit 'f46bb608d9d76c543e4929dc8cffe36b84bd789e'
* commit 'f46bb608d9d76c543e4929dc8cffe36b84bd789e':
dsputil: Split off pixel block routines into their own context
Conflicts:
configure
libavcodec/dsputil.c
libavcodec/mpegvideo_enc.c
libavcodec/pixblockdsp_template.c
libavcodec/x86/dsputilenc.asm
libavcodec/x86/dsputilenc_mmx.c
Merged-by: Michael Niedermayer <[email protected]>
Diffstat (limited to 'cmdutils_common_opts.h')
0 files changed, 0 insertions, 0 deletions