ffmpeg | branch: master | Michael Niedermayer <[email protected]> | Sat Feb 14
21:48:32 2015 +0100| [d8901c2f018ec85e12bfd7d1a7d5dd76229db85e] | committer:
Michael Niedermayer
Merge commit 'b339019de4e5f4d3c661bbdba98ae248ab77e2f0'
* commit 'b339019de4e5f4d3c661bbdba98ae248ab77e2f0':
dca: Split code for handling the EXSS extension off into a separate file
Conflicts:
libavcodec/Makefile
libavcodec/dcadec.c
Merged-by: Michael Niedermayer <[email protected]>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d8901c2f018ec85e12bfd7d1a7d5dd76229db85e
---
_______________________________________________
ffmpeg-cvslog mailing list
[email protected]
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
