diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-01-18 02:26:41 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-01-18 02:26:55 +0100 |
| commit | 099e0178bf560154f39f9043c0f915396f06e706 (patch) | |
| tree | 65f16e4ed56413c3ad92669dd53f0504ca5d45cf /libavcodec/xiph.c | |
| parent | dc84cf241cccf440dbad2e3bf31784be7ff1d0f6 (diff) | |
| parent | 527617485914004dc8b772056322ea5ae74c800d (diff) | |
| download | ffmpeg-099e0178bf560154f39f9043c0f915396f06e706.tar.gz | |
Merge commit '527617485914004dc8b772056322ea5ae74c800d' into release/2.4
* commit '527617485914004dc8b772056322ea5ae74c800d':
lavc: Move the libtwolame encoder registration to the list for external libraries
Conflicts:
libavcodec/allcodecs.c
See: f5f98727b361c62d3962cef37a100db95d62b702
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/xiph.c')
0 files changed, 0 insertions, 0 deletions