ffmpeg | branch: master | Michael Niedermayer <[email protected]> | Tue Nov 4
22:33:09 2014 +0100| [ae4bb6c4884f16474856d7c6537e16999d4b16b1] | committer:
Michael Niedermayer
Merge commit '77ab341c0c6cdf2bd437bb48d429e797d1e60da2'
* commit '77ab341c0c6cdf2bd437bb48d429e797d1e60da2':
aacdec: add default case in channel layout
Conflicts:
libavcodec/aacdec.c
Note, the default case is currently unreachable
See: a48b890392aa22033f182421ba9e3f3b3256461d
Merged-by: Michael Niedermayer <[email protected]>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ae4bb6c4884f16474856d7c6537e16999d4b16b1
---
_______________________________________________
ffmpeg-cvslog mailing list
[email protected]
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
