[FFmpeg-cvslog] Merge commit 'a2b7eeeb06471979ee39fd3075a04633222678a6'

Michael Niedermayer git at videolan.org
Tue Jul 30 10:24:41 CEST 2013


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Jul 30 10:19:20 2013 +0200| [ef1544740e023c26d93f9b11904ad1725139d5e7] | committer: Michael Niedermayer

Merge commit 'a2b7eeeb06471979ee39fd3075a04633222678a6'

* commit 'a2b7eeeb06471979ee39fd3075a04633222678a6':
  hlsproto: Store all durations in AV_TIME_BASE

Conflicts:
	libavformat/hlsproto.c

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

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





More information about the ffmpeg-cvslog mailing list