[FFmpeg-cvslog] Merge commit '65b8b6c476454d201348737527a1d9471f689278'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Aug  9 20:48:53 2014 +0200| [ca80c65726dba7b82e7745b3c3ed1d251ca19f39] | committer: Michael Niedermayer

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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ca80c65726dba7b82e7745b3c3ed1d251ca19f39
---