diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-23 21:39:14 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-23 21:42:13 +0200 |
| commit | 9bff8cfc913e55c2fb0f12be3d7ed06b681166c6 (patch) | |
| tree | 1cb992083d840480146a76d551b7c1be9a52e0b2 /libavformat/4xm.c | |
| parent | 554d8190624f25cefe079bd7b9ad61a2ade8541a (diff) | |
| parent | f9f34cb9983ec6f4ef119c34b726d3b39c143110 (diff) | |
| download | ffmpeg-9bff8cfc913e55c2fb0f12be3d7ed06b681166c6.tar.gz | |
Merge commit 'f9f34cb9983ec6f4ef119c34b726d3b39c143110'
* commit 'f9f34cb9983ec6f4ef119c34b726d3b39c143110':
ogg: Use separate classes for the aliases
Conflicts:
libavformat/oggenc.c
See: 2ccc6ff03acc3ca31db1aeb828c747d05b5cb6aa
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/4xm.c')
0 files changed, 0 insertions, 0 deletions