[SCM] libav/experimental: libx265: Support SAR

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 0f7fa48cf1a36ed135c9e0cb01a6b84179aea25b
Author: Derek Buitenhuis <derek.buitenhuis at gmail.com>
Date:   Fri Feb 21 12:05:50 2014 -0500

    libx265: Support SAR
    
    Signed-off-by: Derek Buitenhuis <derek.buitenhuis at gmail.com>

diff --git a/libavcodec/libx265.c b/libavcodec/libx265.c
index 2babac3..2846c34 100644
--- a/libavcodec/libx265.c
+++ b/libavcodec/libx265.c
@@ -77,6 +77,7 @@ static av_cold int libx265_encode_init(AVCodecContext *avctx)
     libx265Context *ctx = avctx->priv_data;
     x265_nal *nal;
     uint8_t *buf;
+    int sar_num, sar_den;
     int nnal;
     int ret;
     int i;
@@ -113,6 +114,15 @@ static av_cold int libx265_encode_init(AVCodecContext *avctx)
     ctx->params->sourceWidth     = avctx->width;
     ctx->params->sourceHeight    = avctx->height;
 
+    av_reduce(&sar_num, &sar_den,
+              avctx->sample_aspect_ratio.num,
+              avctx->sample_aspect_ratio.den, 4096);
+    ctx->params->bEnableVuiParametersPresentFlag = 1;
+    ctx->params->bEnableAspectRatioIdc           = 1;
+    ctx->params->aspectRatioIdc                  = 255;
+    ctx->params->sarWidth                        = sar_num;
+    ctx->params->sarHeight                       = sar_den;
+
     if (x265_max_bit_depth == 8)
         ctx->params->internalBitDepth = 8;
     else if (x265_max_bit_depth == 12)

-- 
Libav/FFmpeg packaging