diff options
| author | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-02-02 02:10:38 +0300 |
|---|---|---|
| committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-02-02 14:42:12 +0300 |
| commit | 2de73ea7c3b524f03837e06fbd40095aa1fac23b (patch) | |
| tree | 224cc78e298c76c0db4416aaf17632b7957495b3 | |
| parent | 0b28f6fa82b047d45eac8cf57e7a6d7106682b30 (diff) | |
High bit depth subtitle blending should use uint16_t (just like uint8_t for 8-bit)
| -rw-r--r-- | decoder/LAVVideo/subtitles/LAVSubtitleConsumer.cpp | 2 | ||||
| -rw-r--r-- | decoder/LAVVideo/subtitles/blend/blend_generic.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/decoder/LAVVideo/subtitles/LAVSubtitleConsumer.cpp b/decoder/LAVVideo/subtitles/LAVSubtitleConsumer.cpp index 306540e2..e1b47928 100644 --- a/decoder/LAVVideo/subtitles/LAVSubtitleConsumer.cpp +++ b/decoder/LAVVideo/subtitles/LAVSubtitleConsumer.cpp @@ -277,7 +277,7 @@ STDMETHODIMP CLAVSubtitleConsumer::SelectBlendFunction() case LAVPixFmt_YUV420bX: case LAVPixFmt_YUV422bX: case LAVPixFmt_YUV444bX: - blend = &CLAVSubtitleConsumer::blend_yuv_c<int16_t,0>; + blend = &CLAVSubtitleConsumer::blend_yuv_c<uint16_t,0>; break; default: DbgLog((LOG_ERROR, 10, L"ProcessSubtitleBitmap(): No Blend function available")); diff --git a/decoder/LAVVideo/subtitles/blend/blend_generic.cpp b/decoder/LAVVideo/subtitles/blend/blend_generic.cpp index b06cb593..0e6f6285 100644 --- a/decoder/LAVVideo/subtitles/blend/blend_generic.cpp +++ b/decoder/LAVVideo/subtitles/blend/blend_generic.cpp @@ -174,4 +174,4 @@ DECLARE_BLEND_FUNC_IMPL(blend_yuv_c) template HRESULT CLAVSubtitleConsumer::blend_yuv_c<uint8_t,1>BLEND_FUNC_PARAMS; template HRESULT CLAVSubtitleConsumer::blend_yuv_c<uint8_t,0>BLEND_FUNC_PARAMS; -template HRESULT CLAVSubtitleConsumer::blend_yuv_c<int16_t,0>BLEND_FUNC_PARAMS; +template HRESULT CLAVSubtitleConsumer::blend_yuv_c<uint16_t,0>BLEND_FUNC_PARAMS; |