ffmpeg | branch: master | Michael Niedermayer <[email protected]> | Fri Oct 17
20:35:43 2014 +0200| [5a1aa559054b197b64453c60dd01bc5c37532ff9] | committer:
Michael Niedermayer
Merge commit 'b01a2204b5cff7bb920f42fda1bb0103f450fe93'
* commit 'b01a2204b5cff7bb920f42fda1bb0103f450fe93':
libfdk-aacdec: Enable Decoder Downmix including Downmix Metadata Support
Conflicts:
libavcodec/libfdk-aacdec.c
libavcodec/version.h
Merged-by: Michael Niedermayer <[email protected]>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5a1aa559054b197b64453c60dd01bc5c37532ff9
---
_______________________________________________
ffmpeg-cvslog mailing list
[email protected]
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
