Merge commit '88411b87b4bb3c5820ec232f26ba4a284c11a7f9' into release/2.4
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 18 Jan 2015 02:22:15 +0000 (03:22 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 18 Jan 2015 02:22:15 +0000 (03:22 +0100)
commit02d979d0074a8ec6f6650c8262e15ac50d2b97ce
tree0f3de2754863e87fdfe65b81dd8b131056f17241
parentfb62580fb6cb3f9dfa684b52a8c0a747d1f29167
parent88411b87b4bb3c5820ec232f26ba4a284c11a7f9
Merge commit '88411b87b4bb3c5820ec232f26ba4a284c11a7f9' into release/2.4

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

Conflicts:
libavcodec/h264.c

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