git.sesse.net Git - ffmpeg/commit

]> git.sesse.net Git - ffmpeg/commit

author	Michael Niedermayer <michaelni@gmx.at>
	Tue, 2 Dec 2014 21:26:40 +0000 (22:26 +0100)
committer	Michael Niedermayer <michaelni@gmx.at>
	Tue, 2 Dec 2014 21:26:40 +0000 (22:26 +0100)
commit	02444f02f17d0ca059c19290788aa0fef2afac3a
tree	a62ea9cb59232e0d0e8dbdb0b88b0d50d3ca71ec	tree \| snapshot
parent	781a5a392c4d0da5250c28a153c14f88aad09a73	commit \| diff
parent	3cec81f4d4f26b62bc2d22bb450bbf51ec3a7f09	commit \| diff

Merge commit '3cec81f4d4f26b62bc2d22bb450bbf51ec3a7f09'

* commit '3cec81f4d4f26b62bc2d22bb450bbf51ec3a7f09':
mov: allocate the tag value dynamically

Conflicts:
libavformat/mov.c

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

Unnamed repository; edit this file 'description' to name the repository.