[FFmpeg-cvslog] Merge commit '6bb8720f00e2e6209665f819fb351fd42b82d5d0'
Michael Niedermayer
git at videolan.org
Thu Feb 20 01:56:26 CET 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Feb 20 01:50:26 2014 +0100| [f4c8d002231afbc181e97c512e459ec6860f7098] | committer: Michael Niedermayer
Merge commit '6bb8720f00e2e6209665f819fb351fd42b82d5d0'
* commit '6bb8720f00e2e6209665f819fb351fd42b82d5d0':
AVOptions: deprecate unused AV_OPT_FLAG_METADATA
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=f4c8d002231afbc181e97c512e459ec6860f7098
---
More information about the ffmpeg-cvslog
mailing list