diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-05-29 23:50:56 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-05-29 23:50:56 +0200 |
| commit | cb8763bda7e5e59064193e6b29b0f806560f66d3 (patch) | |
| tree | 93d5bfe924618f2d1fc1d02e621ddf7291470526 /libswresample | |
| parent | b3f461508176236bd9d7c2762fd70e339b1494f8 (diff) | |
| parent | 2ea2612df508abdd1f97c6a6ef56275a52c5c41e (diff) | |
| download | ffmpeg-cb8763bda7e5e59064193e6b29b0f806560f66d3.tar.gz | |
Merge commit '2ea2612df508abdd1f97c6a6ef56275a52c5c41e'
* commit '2ea2612df508abdd1f97c6a6ef56275a52c5c41e':
svq1enc: Rename SVQ1Context to SVQ1EncContext
Conflicts:
libavcodec/svq1enc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswresample')
0 files changed, 0 insertions, 0 deletions