[FFmpeg-cvslog] Merge commit 'bc3f03567a04a9f7e412bcf2ca09c163f3f13941'

Michael Niedermayer git at videolan.org
Sun Feb 9 20:03:30 CET 2014


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Feb  9 20:01:32 2014 +0100| [5b23c7ed6fa9ac99894621fefd2d18b27704913e] | committer: Michael Niedermayer

Merge commit 'bc3f03567a04a9f7e412bcf2ca09c163f3f13941'

* commit 'bc3f03567a04a9f7e412bcf2ca09c163f3f13941':
  g2meet: rename FRAME_INFO to more appropriate DISPLAY_INFO

Conflicts:
	libavcodec/g2meet.c

See: cb2162adba4041951c987f9f365957e067b28a97
Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5b23c7ed6fa9ac99894621fefd2d18b27704913e
---





More information about the ffmpeg-cvslog mailing list