diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-02-18 12:10:46 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-02-18 12:10:57 +0100 |
commit | 4ff0e63a015a5f88e514b924221c89b690565a2d (patch) | |
tree | 4d7c826439985d56e37da69d6e81ec440d1ea9cd /ffserver.c | |
parent | f88f7b86a962b2c700bf37d82d81a73ea2a5aad1 (diff) | |
parent | 56632fef65c0cb6946ed3648ded3d7b82e5c5c17 (diff) | |
download | ffmpeg-4ff0e63a015a5f88e514b924221c89b690565a2d.tar.gz |
Merge commit '56632fef65c0cb6946ed3648ded3d7b82e5c5c17'
* commit '56632fef65c0cb6946ed3648ded3d7b82e5c5c17':
libopencore-amrnb: cosmetics: Group all encoder-related code together
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffserver.c')
0 files changed, 0 insertions, 0 deletions