[FFmpeg-cvslog] Merge commit 'c98f3169bfb578c1a4e407b44524f0bfa3b4dc0c'
Michael Niedermayer
git at videolan.org
Sun Feb 16 02:18:59 CET 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Feb 16 02:05:29 2014 +0100| [a2bc6c116ddc15af47e092af874a0647d114a9f6] | committer: Michael Niedermayer
Merge commit 'c98f3169bfb578c1a4e407b44524f0bfa3b4dc0c'
* commit 'c98f3169bfb578c1a4e407b44524f0bfa3b4dc0c':
lavu: add AV_FRAME_DATA_DOWNMIX_INFO side data type.
Conflicts:
doc/APIchanges
libavutil/version.h
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a2bc6c116ddc15af47e092af874a0647d114a9f6
---
More information about the ffmpeg-cvslog
mailing list