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

author	Michael Niedermayer <michaelni@gmx.at>
	Tue, 18 Nov 2014 02:16:38 +0000 (03:16 +0100)
committer	Michael Niedermayer <michaelni@gmx.at>
	Tue, 18 Nov 2014 02:16:38 +0000 (03:16 +0100)
commit	cdbebae44440bea97f300f256d722c1495753bc2
tree	b9fc7a0e480d3c10bd950cd8495b48982f78de78	tree \| snapshot
parent	8426edef4cf521104bb9288ac46a48dc4bdaee53	commit \| diff
parent	85dc006b1a829726dd5e3a9b0fcc6a1dbfe6dffa	commit \| diff

Merge commit '85dc006b1a829726dd5e3a9b0fcc6a1dbfe6dffa'

* commit '85dc006b1a829726dd5e3a9b0fcc6a1dbfe6dffa':
lavc: fix bitshifts amount bigger than the type

Conflicts:
libavcodec/internal.h

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

FFmpeg git repo