[FFmpeg-cvslog] Merge commit '6b753015ca6f93d16a05e1a97da1fa42e4da60ec'
Michael Niedermayer
git at videolan.org
Fri May 3 11:00:25 CEST 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri May 3 10:55:43 2013 +0200| [1ba4cbf734b343f82e0ae4ab6be3756249771afa] | committer: Michael Niedermayer
Merge commit '6b753015ca6f93d16a05e1a97da1fa42e4da60ec'
* commit '6b753015ca6f93d16a05e1a97da1fa42e4da60ec':
aac: Remove aacpsy.h header, unused since 78e65cd7726
cavs: Remove cavsdata.h header, unused since 88386feefd
Conflicts:
libavcodec/aacpsy.h
libavcodec/cavsdata.h
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1ba4cbf734b343f82e0ae4ab6be3756249771afa
---
More information about the ffmpeg-cvslog
mailing list