[FFmpeg-cvslog] Merge commit 'eb31256f12bf0c85aded1612551ce9230356879e'
Michael Niedermayer
git at videolan.org
Mon Apr 20 12:00:04 CEST 2015
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Apr 20 11:51:24 2015 +0200| [0796a2ab4ff58d454006403395a4be91c403f161] | committer: Michael Niedermayer
Merge commit 'eb31256f12bf0c85aded1612551ce9230356879e'
* commit 'eb31256f12bf0c85aded1612551ce9230356879e':
g2meet: Support G2M5 codec variant
Conflicts:
libavcodec/version.h
See: 4ba5420e4d3699b89c9f7f15928cd486f88e9562
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0796a2ab4ff58d454006403395a4be91c403f161
---
More information about the ffmpeg-cvslog
mailing list