[FFmpeg-cvslog] Merge commit '88411b87b4bb3c5820ec232f26ba4a284c11a7f9' into release/2.4

[Michael Niedermayer]

ffmpeg | branch: release/2.4 | Michael Niedermayer <michaelni at gmx.at> | Sun Jan 18 03:22:15 2015 +0100| [02d979d0074a8ec6f6650c8262e15ac50d2b97ce] | committer: Michael Niedermayer

Merge commit '88411b87b4bb3c5820ec232f26ba4a284c11a7f9' into release/2.4

* commit '88411b87b4bb3c5820ec232f26ba4a284c11a7f9':
  display: fix order of operands

Conflicts:
	libavcodec/h264.c

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

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=02d979d0074a8ec6f6650c8262e15ac50d2b97ce
---