Merge commit '70211539a39ca3854f8a9e97d51dc27caa079943'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 9 Aug 2014 19:01:06 +0000 (21:01 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 9 Aug 2014 19:01:55 +0000 (21:01 +0200)
commit3f2495d98c260e6ea836d2f8e0b8e093983e8337
treeb97928b22b254cd742bb15ef6cc7d26aa008679f
parent73e9d4cd6fa6fb627f0cf0affb91fa7dac7f9c68
parent70211539a39ca3854f8a9e97d51dc27caa079943
Merge commit '70211539a39ca3854f8a9e97d51dc27caa079943'

* commit '70211539a39ca3854f8a9e97d51dc27caa079943':
  hevc: deobfuscate slice/tile boundary handling for DBF

Conflicts:
libavcodec/hevc.c
libavcodec/hevc_filter.c

See: a5c621aa852522c79146035b2db4b89d2e096d3c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/hevc.c