[FFmpeg-cvslog] Merge commit '55019715785790836f60870180e1764b06e6591c'

[Michael Niedermayer]

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

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

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