]> git.sesse.net Git - ffmpeg/commitdiff
projects / ffmpeg / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ce838ad 677c804)
Merge commit '677c804aa3a78d61b21e6423165a252846c20f0e'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 7 Jun 2015 23:19:26 +0000 (01:19 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 7 Jun 2015 23:29:36 +0000 (01:29 +0200)
* commit '677c804aa3a78d61b21e6423165a252846c20f0e':
  aac: correctly map 7.1ch-wide AAC from FDK AAC encoder

Sample: FDK_7.1ch_wide.aac
Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavcodec/aacdec.c patch | diff1 | diff2 | blob | history

diff --cc libavcodec/aacdec.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.