diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-03-11 14:59:51 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-03-11 15:00:52 +0100 |
| commit | 3efbbbb5094a146efeb1f0613918ea97d31d00d2 (patch) | |
| tree | 5801f0fc784c2f00e0d8f70f0d3543e562fe5fb2 /libavcodec/nellymoser.c | |
| parent | 2800e8d62e4c6cdd8a7e218cb15a10f216946f18 (diff) | |
| parent | 35d7d6f7489c75aaa2fcb39820fb25b0fd44524b (diff) | |
| download | ffmpeg-3efbbbb5094a146efeb1f0613918ea97d31d00d2.tar.gz | |
Merge remote-tracking branch 'remotes/newdev/master'
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/nellymoser.c')
0 files changed, 0 insertions, 0 deletions