Michael Niedermayer 76424b2da8 Merge commit 'e01fba5562133ac56a4f44c6f214a80ee33cb388' ...

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

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

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

2013-10-23 12:05:48 +02:00

153 KiB

Raw Blame History

View Raw