diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-05-30 00:01:45 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-05-30 00:01:45 +0200 |
| commit | ea0931fb962f2436695606a8ef9a4811e4970e22 (patch) | |
| tree | b7e21eae75f3345b7c0d71855e7e611f1eca4f54 /ffmpeg.h | |
| parent | cb8763bda7e5e59064193e6b29b0f806560f66d3 (diff) | |
| parent | 65d5d5865845f057cc6530a8d0f34db952d9009c (diff) | |
| download | ffmpeg-ea0931fb962f2436695606a8ef9a4811e4970e22.tar.gz | |
Merge commit '65d5d5865845f057cc6530a8d0f34db952d9009c'
* commit '65d5d5865845f057cc6530a8d0f34db952d9009c':
dsputil: Move SVQ1 encoding specific bits into svq1enc
Conflicts:
libavcodec/x86/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffmpeg.h')
0 files changed, 0 insertions, 0 deletions