apps/ffmpeg-rockchip
1
0
Fork 0
mirror of https://github.com/nyanmisaka/ffmpeg-rockchip.git synced 2025-11-03 09:41:17 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit '95d52464542f532061290192518d5fe1c1930e8d'

Browse Source 
* 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>
This commit is contained in:
Michael Niedermayer
2013-06-24 10:57:04 +02:00
parent 14a61bc3f9 95d5246454
commit af5f9c0876
5 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
doc/APIchanges
View File

@@ -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: