git.ffmpeg.org Git - ffmpeg.git/commit

author	Michael Niedermayer <michaelni@gmx.at>
	Fri, 31 Oct 2014 00:46:25 +0000 (01:46 +0100)
committer	Michael Niedermayer <michaelni@gmx.at>
	Fri, 31 Oct 2014 00:46:25 +0000 (01:46 +0100)
commit	8065a0cdbed7c909bdbdd4708368e6096db3752b
tree	6fa0ae72b886cd9bbe32c23fc2c9a984b865608d	tree \| snapshot
parent	f76cd09d466efffdb51b418ce2ce34c7a7e6d342	commit \| diff
parent	cf589faa5b7aed3bb38e08dcd00bd951e69686d1	commit \| diff

Merge commit 'cf589faa5b7aed3bb38e08dcd00bd951e69686d1'

* commit 'cf589faa5b7aed3bb38e08dcd00bd951e69686d1':
movenc: Add a flag for using default-base-is-moof in tfhd atoms

Conflicts:
libavformat/version.h

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

FFmpeg git repo