Michael Niedermayer 802e5fc8f8 Merge commit '1e9db41e2a2166be5671b088ef4ad06a40af459f' ...

* commit '1e9db41e2a2166be5671b088ef4ad06a40af459f':
  movenc: Allow override of major brand in ftyp atom

Conflicts:
	libavformat/movenc.c

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

2014-03-23 03:22:20 +01:00

5.7 KiB

Raw Blame History

View Raw