xenia-project/FFmpeg
1
0
Fork 0
mirror of https://github.com/xenia-project/FFmpeg.git synced 2024-11-28 14:01:27 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

matroska: properly handle real video extradata

Browse Source 
Originally committed as revision 7128 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Aurelien Jacobs 2006-11-20 00:15:52 +00:00
parent a76920d843
commit 363c86ce66
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libavformat/matroska.c
View File

@ -2193,6 +2193,7 @@ matroska_read_header (AVFormatContext *s,
enum CodecID codec_id = CODEC_ID_NONE;
uint8_t *extradata = NULL;
int extradata_size = 0;
int extradata_offset = 0;
track = matroska->tracks[i];
/* libavformat does not really support subtitles.
@ -2262,6 +2263,12 @@ matroska_read_header (AVFormatContext *s,
}
}
else if (codec_id == CODEC_ID_RV10 || codec_id == CODEC_ID_RV20 ||
codec_id == CODEC_ID_RV30 || codec_id == CODEC_ID_RV40) {
extradata_offset = 26;
track->codec_priv_size -= extradata_offset;
}
if (codec_id == CODEC_ID_NONE) {
av_log(matroska->ctx, AV_LOG_INFO,
"Unknown/unsupported CodecID %s.\n",
@ -2290,7 +2297,7 @@ matroska_read_header (AVFormatContext *s,
if(st->codec->extradata == NULL)
return AVERROR_NOMEM;
st->codec->extradata_size = track->codec_priv_size;
memcpy(st->codec->extradata, track->codec_priv,
memcpy(st->codec->extradata,track->codec_priv+extradata_offset,
track->codec_priv_size);
}