Merge commit '16c01fb4347312b6d29a6498dad627665b96a20e'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 17 Nov 2014 10:30:41 +0000 (11:30 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 17 Nov 2014 10:30:41 +0000 (11:30 +0100)
commitc192be196839ae28a55b37a01209bc052b8fdbe3
tree6ceb892b04862b5e98ebf55454fcc369bc0bf206
parente7fdfbdc58bd5c9c30c612ae12b4f9fd8ad13d17
parent16c01fb4347312b6d29a6498dad627665b96a20e
Merge commit '16c01fb4347312b6d29a6498dad627665b96a20e'

* commit '16c01fb4347312b6d29a6498dad627665b96a20e':
  hevc: remove an unused function parameter

Conflicts:
libavcodec/hevc.c

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