LAV
/
FFmpeg
1
0
Fork 0
Code

matroskadec_haali: parse bit depth from BITMAPINFOHEADER

This commit is contained in:
Hendrik Leppkes 2014-06-19 09:31:49 -05:00
parent 28cc890083
commit ffb8e8a15e
Signed by: hendrik
GPG Key ID: 846079A4B0A7C1B5
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavformat/matroskadec_haali.c
View File

@ -1038,6 +1038,7 @@ static int mkv_read_header(AVFormatContext *s)
AVStream *st;
uint32_t fourcc = 0;
AVIOContext b;
int bit_depth = -1;
track->info = info;
@ -1085,7 +1086,8 @@ static int mkv_read_header(AVFormatContext *s)
if (!strcmp(info->CodecID, "V_MS/VFW/FOURCC") && info->CodecPrivateSize >= 40 && info->CodecPrivate != NULL) {
track->ms_compat = 1;
fourcc = AV_RL32((uint8_t *)info->CodecPrivate + 16);
bit_depth = AV_RL16((uint8_t *)info->CodecPrivate + 14);
fourcc = AV_RL32((uint8_t *)info->CodecPrivate + 16);
codec_id = ff_codec_get_id(ff_codec_bmp_tags, fourcc);
} else if (!strcmp(info->CodecID, "A_MS/ACM") && info->CodecPrivateSize >= 14 && info->CodecPrivate != NULL) {
ffio_init_context(&b, (uint8_t *)info->CodecPrivate, info->CodecPrivateSize, 0, NULL, NULL, NULL, NULL);
@ -1146,6 +1148,8 @@ static int mkv_read_header(AVFormatContext *s)
if (info->Type == TT_VIDEO) {
st->codec->codec_type = AVMEDIA_TYPE_VIDEO;
st->codec->codec_tag = fourcc;
if (bit_depth >= 0)
st->codec->bits_per_coded_sample = bit_depth;
st->codec->width = info->AV.Video.PixelWidth;
st->codec->height = info->AV.Video.PixelHeight;
if (info->AV.Video.DisplayWidth && info->AV.Video.DisplayHeight) {