Merge commit 'b1b1a7370e141c912e3d0bbaa668dcee05c3ad67'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 13 Nov 2014 11:53:31 +0000 (12:53 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 13 Nov 2014 11:53:31 +0000 (12:53 +0100)
commit76fa78911f58c9707226559e0f57be8d47fb2fca
tree1b5e61e129fb1d3052e914daddc0962a8b3353fa
parent946a5cb64d580098e6abc399fd404e81fc816742
parentb1b1a7370e141c912e3d0bbaa668dcee05c3ad67
Merge commit 'b1b1a7370e141c912e3d0bbaa668dcee05c3ad67'

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

Conflicts:
libavcodec/h264.c

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