diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-06-24 10:57:04 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-06-24 10:57:04 +0200 |
| commit | af5f9c08763baff271401cf7f7478bae4d5db8dc (patch) | |
| tree | 1d62c75c69c64ce230b308073112c7beb4595b97 /doc | |
| parent | 14a61bc3f9ad68151368bc3577bb26fe1146fbf4 (diff) | |
| parent | 95d52464542f532061290192518d5fe1c1930e8d (diff) | |
Merge commit '95d52464542f532061290192518d5fe1c1930e8d'
* commit '95d52464542f532061290192518d5fe1c1930e8d':
lavc: Add option to encode MPEG-2 AAC with libfdk-aac
Conflicts:
doc/APIchanges
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/APIchanges | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/doc/APIchanges b/doc/APIchanges index ffdb8a2898..880687ba63 100644 --- a/doc/APIchanges +++ b/doc/APIchanges @@ -15,6 +15,8 @@ libavutil: 2012-10-22 API changes, most recent first: +2013-06-xx - xxxxxxx - lavc 55.10.0 - avcodec.h + Add MPEG-2 AAC profiles 2013-06-xx - xxxxxxx - lavu 52.36.100 Add AVRIPEMD: |