virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-02-04 06:08:26 +02:00
Code Issues Releases Activity

Matroska muxer needs to format all NAL units, not only extradata.

Browse Source 
Originally committed as revision 11510 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Aurelien Jacobs 2008-01-11 23:21:22 +00:00
parent 9f7458b285
commit e609806ec6
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libavformat/matroskaenc.c
View File

@ -745,6 +745,16 @@ static int mkv_write_packet(AVFormatContext *s, AVPacket *pkt)
av_md5_update(mkv->md5_ctx, pkt->data, FFMIN(200, pkt->size)); av_md5_update(mkv->md5_ctx, pkt->data, FFMIN(200, pkt->size));
} }
if (codec->codec_id == CODEC_ID_H264 &&
codec->extradata_size > 0 && AV_RB32(codec->extradata) == 0x00000001) {
/* from x264 or from bytestream h264 */
/* nal reformating needed */
int ret = avc_parse_nal_units(pkt->data, &pkt->data, &pkt->size);
if (ret < 0)
return ret;
assert(pkt->size);
}
if (codec->codec_type != CODEC_TYPE_SUBTITLE) { if (codec->codec_type != CODEC_TYPE_SUBTITLE) {
mkv_write_block(s, MATROSKA_ID_SIMPLEBLOCK, pkt, keyframe << 7); mkv_write_block(s, MATROSKA_ID_SIMPLEBLOCK, pkt, keyframe << 7);
} else { } else {