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

author	Michael Niedermayer <michaelni@gmx.at>
	Fri, 19 Dec 2014 03:57:25 +0000 (04:57 +0100)
committer	Michael Niedermayer <michaelni@gmx.at>
	Fri, 19 Dec 2014 03:57:25 +0000 (04:57 +0100)
commit	988d27b8029d9b4ccb13e792004cc8375b835eac
tree	8931c74a18dcf3876f6db7569a7404b64ed5abab	tree \| snapshot
parent	76a8127a452f9e149a876c5fa6d6f0634e3b5b1e	commit \| diff
parent	b1306823d0b3ae998c8e10ad832004eb13bdd93e	commit \| diff

Merge commit 'b1306823d0b3ae998c8e10ad832004eb13bdd93e'

* commit 'b1306823d0b3ae998c8e10ad832004eb13bdd93e':
check memory errors from av_strdup()

Conflicts:
avprobe.c
libavformat/matroskaenc.c
libavutil/opt.c

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

FFmpeg git repo