[FFmpeg-cvslog] Merge commit '2dc265619a2fc9c6f9aff7ac2bcdbcb90e9610cb'

Michael Niedermayer git at videolan.org
Mon Jun 16 12:53:59 CEST 2014


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Jun 16 12:24:53 2014 +0200| [83d100baea7ae9549ac189772a62d83dc6bc48e4] | committer: Michael Niedermayer

Merge commit '2dc265619a2fc9c6f9aff7ac2bcdbcb90e9610cb'

* commit '2dc265619a2fc9c6f9aff7ac2bcdbcb90e9610cb':
  lavf: group dump functions together

Conflicts:
	libavformat/utils.c

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

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





More information about the ffmpeg-cvslog mailing list