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

author	Michael Niedermayer <michaelni@gmx.at>
	Sat, 25 Oct 2014 02:45:23 +0000 (04:45 +0200)
committer	Michael Niedermayer <michaelni@gmx.at>
	Sat, 25 Oct 2014 02:45:23 +0000 (04:45 +0200)
commit	8be93ba049f1bb62ce03a86f7d9a8a49934b9ff8
tree	5ad5d978fc657472427069c40ac0a7f24574f886	tree \| snapshot
parent	3ae818f6ab04f14838ee073e685d73519725f6d1	commit \| diff
parent	28c020d4df9b060a58a124a7a5406d4313fbe249	commit \| diff

Merge commit '28c020d4df9b060a58a124a7a5406d4313fbe249'

* commit '28c020d4df9b060a58a124a7a5406d4313fbe249':
matroskaenc: check avio_open_dyn_buf return value

Conflicts:
libavformat/matroskaenc.c

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

FFmpeg git repo