diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-04-09 02:16:05 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-04-09 02:17:56 +0200 |
| commit | 6c019f05ed5333037e192e8c84d047321fc3629a (patch) | |
| tree | 4a4bb164de880b131240afc9ad7c829963d10ac7 /common.mak | |
| parent | 1752b1459d09d822e2765497416c7dd66e6a875b (diff) | |
| parent | 718907cd881a0b593264aed059c0e00da13f9e15 (diff) | |
| download | ffmpeg-6c019f05ed5333037e192e8c84d047321fc3629a.tar.gz | |
Merge commit '718907cd881a0b593264aed059c0e00da13f9e15'
* commit '718907cd881a0b593264aed059c0e00da13f9e15':
libtwolame MP2 encoding support
Conflicts:
Changelog
configure
doc/general.texi
libavcodec/Makefile
libavcodec/libtwolame.c
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'common.mak')
0 files changed, 0 insertions, 0 deletions