[FFmpeg-cvslog] Merge commit '885a9d6087315a85d98f7e89656ef01dc7104c4c'

Clément Bœsch git at videolan.org
Tue Jun 21 22:22:20 CEST 2016


ffmpeg | branch: master | Clément Bœsch <u at pkh.me> | Tue Jun 21 22:20:49 2016 +0200| [475a686a0157a4f0243a0df4a02fadf469e5159c] | committer: Clément Bœsch

Merge commit '885a9d6087315a85d98f7e89656ef01dc7104c4c'

* commit '885a9d6087315a85d98f7e89656ef01dc7104c4c':
  pgssub: Fix subpicture colorspace and range

See 9779b6262471d553c1ed811ff7312564e39d8adf

Merged-by: Clément Bœsch <u at pkh.me>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=475a686a0157a4f0243a0df4a02fadf469e5159c
---

 libavcodec/pgssubdec.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavcodec/pgssubdec.c b/libavcodec/pgssubdec.c
index 133d08b..880fc96 100644
--- a/libavcodec/pgssubdec.c
+++ b/libavcodec/pgssubdec.c
@@ -354,7 +354,7 @@ static int parse_palette_segment(AVCodecContext *avctx,
         cb        = bytestream_get_byte(&buf);
         alpha     = bytestream_get_byte(&buf);
 
-        /* Default to BT.709 colorimetry. In case of <= 576 height use BT.601 */
+        /* Default to BT.709 colorspace. In case of <= 576 height use BT.601 */
         if (avctx->height <= 0 || avctx->height > 576) {
             YUV_TO_RGB1_CCIR_BT709(cb, cr);
         } else {


======================================================================




More information about the ffmpeg-cvslog mailing list