Merge remote-tracking branch 'qatar/master'

author Michael Niedermayer <michaelni@gmx.at>

Sun, 17 Mar 2013 11:58:57 +0000 (12:58 +0100)

committer Michael Niedermayer <michaelni@gmx.at>

Sun, 17 Mar 2013 11:59:04 +0000 (12:59 +0100)
author Michael Niedermayer <michaelni@gmx.at>
Sun, 17 Mar 2013 11:58:57 +0000 (12:58 +0100)
committer Michael Niedermayer <michaelni@gmx.at>
Sun, 17 Mar 2013 11:59:04 +0000 (12:59 +0100)
diff --cc libavcodec/utils.c
Simple merge
diff --cc libavfilter/buffersrc.c
Simple merge
author	Michael Niedermayer <michaelni@gmx.at>
	Sun, 17 Mar 2013 11:58:57 +0000 (12:58 +0100)
committer	Michael Niedermayer <michaelni@gmx.at>
	Sun, 17 Mar 2013 11:59:04 +0000 (12:59 +0100)
		1	2
libavcodec/utils.c	patch \|	diff1 \|	diff2 \|	blob \| history
libavfilter/buffersrc.c	patch \|	diff1 \|	diff2 \|	blob \| history