[FFmpeg-cvslog] Merge commit '592a04054e6423be5050efd2bceece48b10b9c1d'
Michael Niedermayer
git at videolan.org
Tue Mar 24 01:55:26 CET 2015
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Mar 24 01:45:43 2015 +0100| [d280d43c2666c5f5c0cd346234391cd9f4076e83] | committer: Michael Niedermayer
Merge commit '592a04054e6423be5050efd2bceece48b10b9c1d'
* commit '592a04054e6423be5050efd2bceece48b10b9c1d':
pixdesc: Replace a few leftover instances of non AV-prefixed flags
Conflicts:
libavutil/pixdesc.c
See: c7c71f95f8d3e98babf8b6b7f1edc49f14e2c4c4
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d280d43c2666c5f5c0cd346234391cd9f4076e83
---
More information about the ffmpeg-cvslog
mailing list