[FFmpeg-cvslog] Merge commit '49a242687cf44f86570b706db3c5912ff06bc6c2'

Michael Niedermayer git at videolan.org
Wed Jun 18 23:22:09 CEST 2014


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Jun 18 23:09:35 2014 +0200| [1ebc77bc7d68748598878c08c85a571b526a729f] | committer: Michael Niedermayer

Merge commit '49a242687cf44f86570b706db3c5912ff06bc6c2'

* commit '49a242687cf44f86570b706db3c5912ff06bc6c2':
  doc: Document segment_list_type

Conflicts:
	doc/muxers.texi

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

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





More information about the ffmpeg-cvslog mailing list