Merge remote-tracking branch 'qatar/master'

author Michael Niedermayer <michaelni@gmx.at>

Tue, 24 Apr 2012 21:44:56 +0000 (23:44 +0200)

committer Michael Niedermayer <michaelni@gmx.at>

Tue, 24 Apr 2012 21:45:09 +0000 (23:45 +0200)
author Michael Niedermayer <michaelni@gmx.at>
Tue, 24 Apr 2012 21:44:56 +0000 (23:44 +0200)
committer Michael Niedermayer <michaelni@gmx.at>
Tue, 24 Apr 2012 21:45:09 +0000 (23:45 +0200)
diff --cc ffmpeg.c
Simple merge
diff --cc libavformat/isom.c
Simple merge
author	Michael Niedermayer <michaelni@gmx.at>
	Tue, 24 Apr 2012 21:44:56 +0000 (23:44 +0200)
committer	Michael Niedermayer <michaelni@gmx.at>
	Tue, 24 Apr 2012 21:45:09 +0000 (23:45 +0200)
		1	2
ffmpeg.c	patch \|	diff1 \|	diff2 \|	blob \| history
libavformat/isom.c	patch \|	diff1 \|	diff2 \|	blob \| history