diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-22 21:14:43 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-22 21:41:00 +0200 |
| commit | 300d489ac9bb11b67bde90521d43d12fe68be72e (patch) | |
| tree | ad9174165f29e2f86dba416bc58b2417d2aaf810 /libavutil/pixelutils.c | |
| parent | 3e07a056a8e67c8c8a1fdf4b1efd231aa9bcd0ad (diff) | |
| parent | 051aadeed104ecbe8ee4850ec2d7e5394f5e1ccd (diff) | |
| download | ffmpeg-300d489ac9bb11b67bde90521d43d12fe68be72e.tar.gz | |
Merge commit '051aadeed104ecbe8ee4850ec2d7e5394f5e1ccd'
* commit '051aadeed104ecbe8ee4850ec2d7e5394f5e1ccd':
ogg: Provide aliases for Speex, Opus and audio-only ogg
Conflicts:
Changelog
libavformat/oggenc.c
libavformat/version.h
See: 2ccc6ff03acc3ca31db1aeb828c747d05b5cb6aa
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/pixelutils.c')
0 files changed, 0 insertions, 0 deletions