virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-21 10:55:51 +02:00
Code Issues Releases Activity

Merge commit 'eddf95283fbba1b469b76e7518bc3941f671b193'

Browse Source 
* commit 'eddf95283fbba1b469b76e7518bc3941f671b193':
  vp9: initialize color space and range properties

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-10-09 02:45:38 +02:00
commit 5b134a0544
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libavcodec/vp9.c
View File

@ -3780,6 +3780,18 @@ static int vp9_decode_frame(AVCodecContext *ctx, void *frame,
return res;
}
if (s->fullrange)
ctx->color_range = AVCOL_RANGE_JPEG;
else
ctx->color_range = AVCOL_RANGE_MPEG;
switch (s->colorspace) {
case 1: ctx->colorspace = AVCOL_SPC_BT470BG; break;
case 2: ctx->colorspace = AVCOL_SPC_BT709; break;
case 3: ctx->colorspace = AVCOL_SPC_SMPTE170M; break;
case 4: ctx->colorspace = AVCOL_SPC_SMPTE240M; break;
}
// main tile decode loop
memset(s->above_partition_ctx, 0, s->cols);
memset(s->above_skip_ctx, 0, s->cols);