Merge commit 'a7a17e3f1915ce69b787dc58c5d8dba0910fc0a4'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 9 Aug 2014 19:17:14 +0000 (21:17 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 9 Aug 2014 19:29:33 +0000 (21:29 +0200)
commit8d7c4cc08238d06eb921bb0c6134a4475b0c689e
treef19330af9fa8f49a231795ef14252ba2f2865c0f
parent3f2495d98c260e6ea836d2f8e0b8e093983e8337
parenta7a17e3f1915ce69b787dc58c5d8dba0910fc0a4
Merge commit 'a7a17e3f1915ce69b787dc58c5d8dba0910fc0a4'

* commit 'a7a17e3f1915ce69b787dc58c5d8dba0910fc0a4':
  hevc_filter: move some conditions out of loops

Conflicts:
libavcodec/hevc_filter.c

This is possibly less readable than the variant used before.
Thus please take a look and if people agree its worse, dont
hesitate to revert.

See: 83976e40e89655162e5394cf8915d9b6d89702d9
Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/hevc_filter.c