Merge commit '55019715785790836f60870180e1764b06e6591c'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 9 Aug 2014 18:51:48 +0000 (20:51 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 9 Aug 2014 18:51:48 +0000 (20:51 +0200)
commit73e9d4cd6fa6fb627f0cf0affb91fa7dac7f9c68
tree22a8aa2fcda3a26ff6b2e551f5c16522cb39d964
parentca80c65726dba7b82e7745b3c3ed1d251ca19f39
parent55019715785790836f60870180e1764b06e6591c
Merge commit '55019715785790836f60870180e1764b06e6591c'

* commit '55019715785790836f60870180e1764b06e6591c':
  hevc_filter: drop more redundant checks

Conflicts:
libavcodec/hevc_filter.c

No change, as the removed checks where not in FFmpeg

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