Merge commit '65b8b6c476454d201348737527a1d9471f689278'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 9 Aug 2014 18:48:53 +0000 (20:48 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 9 Aug 2014 18:48:53 +0000 (20:48 +0200)
commitca80c65726dba7b82e7745b3c3ed1d251ca19f39
tree22a8aa2fcda3a26ff6b2e551f5c16522cb39d964
parentadba796eb4a5373d781e093988f9aa0c3418c6b6
parent65b8b6c476454d201348737527a1d9471f689278
Merge commit '65b8b6c476454d201348737527a1d9471f689278'

* commit '65b8b6c476454d201348737527a1d9471f689278':
  hevc_filter: drop redundant checks

Conflicts:
libavcodec/hevc_filter.c

No change as the removed checks where not in ffmpeg

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