Merge commit '4d1ff2a489f4c60501b1a6a2d1f3874e61a77df9'

* commit '4d1ff2a489f4c60501b1a6a2d1f3874e61a77df9':
  hevc: calculate the dbf strength in hls_pcm_sample() only if dbf is enabled

Conflicts:
	libavcodec/hevc.c

See: 83976e40e8
Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-08-09 20:32:38 +02:00
commit adba796eb4

Diff Content Not Available