[FFmpeg-cvslog] Merge commit 'e01fba5562133ac56a4f44c6f214a80ee33cb388'

Michael Niedermayer git at videolan.org
Wed Oct 23 12:13:38 CEST 2013


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Oct 23 12:02:05 2013 +0200| [76424b2da8506be50ea95e0b415f154054f0d2d1] | committer: Michael Niedermayer

Merge commit 'e01fba5562133ac56a4f44c6f214a80ee33cb388'

* commit 'e01fba5562133ac56a4f44c6f214a80ee33cb388':
  movenc: Add an F4V muxer

Conflicts:
	Changelog
	libavformat/allformats.c
	libavformat/movenc.c
	libavformat/version.h

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

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





More information about the ffmpeg-cvslog mailing list