diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-26 20:48:07 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-26 20:48:07 +0200 |
| commit | ffa90d99fd8933b17917045a3768bb9dcfb56f72 (patch) | |
| tree | 0d307a55c1ed7a8d826e81f861b0adf87c53a37d /libavcodec/g722enc.c | |
| parent | 7206221d563e6d1d6bf2d5acd3b1378d77c7b7e4 (diff) | |
| parent | 56a721f020273d69daa8dcb0d99e42a43a0a0d4d (diff) | |
| download | ffmpeg-ffa90d99fd8933b17917045a3768bb9dcfb56f72.tar.gz | |
Merge commit '56a721f020273d69daa8dcb0d99e42a43a0a0d4d'
* commit '56a721f020273d69daa8dcb0d99e42a43a0a0d4d':
doc: fix a typo
Conflicts:
doc/APIchanges
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/g722enc.c')
0 files changed, 0 insertions, 0 deletions