diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-09 20:32:38 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-09 20:34:27 +0200 |
| commit | adba796eb4a5373d781e093988f9aa0c3418c6b6 (patch) | |
| tree | 22a8aa2fcda3a26ff6b2e551f5c16522cb39d964 | |
| parent | d7594beedee38211d82c9d30236e3fc22c4cad65 (diff) | |
| parent | 4d1ff2a489f4c60501b1a6a2d1f3874e61a77df9 (diff) | |
| download | ffmpeg-streaming-adba796eb4a5373d781e093988f9aa0c3418c6b6.zip ffmpeg-streaming-adba796eb4a5373d781e093988f9aa0c3418c6b6.tar.gz | |
Merge commit '4d1ff2a489f4c60501b1a6a2d1f3874e61a77df9'
* commit '4d1ff2a489f4c60501b1a6a2d1f3874e61a77df9':
hevc: calculate the dbf strength in hls_pcm_sample() only if dbf is enabled
Conflicts:
libavcodec/hevc.c
See: 83976e40e89655162e5394cf8915d9b6d89702d9
Merged-by: Michael Niedermayer <michaelni@gmx.at>
0 files changed, 0 insertions, 0 deletions
