diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-08 00:13:20 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-08 00:13:20 +0100 |
| commit | fabf69f37abe1560c85d6483f75849014da2971e (patch) | |
| tree | 5b087f6b080ced4e73a2000e36f2fd2d851c44cc /libavcodec/cavsdsp.c | |
| parent | b3d9ab182929c64d65f36035770dc8d1a8513196 (diff) | |
| parent | f69befe5eefef12172a6479dd9cef3c01bddec7a (diff) | |
| download | ffmpeg-fabf69f37abe1560c85d6483f75849014da2971e.tar.gz | |
Merge commit 'f69befe5eefef12172a6479dd9cef3c01bddec7a'
* commit 'f69befe5eefef12172a6479dd9cef3c01bddec7a':
matroskadec: cosmetics: Fix "attachement" vs. "attachment" typo
Conflicts:
libavformat/matroskadec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/cavsdsp.c')
0 files changed, 0 insertions, 0 deletions