* commit 'b1b1a737':
  display: fix order of operands

Conflicts:
	libavcodec/h264.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>