# HG changeset patch # User aurel # Date 1200015165 0 # Node ID 0fde8da65761860e18a0a432611d2291d85478fd # Parent dcd599833abce3015ececc7bcb53071e6eee4984 Use the isom avcc formatting for h264 extradata in matroska. diff -r dcd599833abc -r 0fde8da65761 matroskaenc.c --- a/matroskaenc.c Fri Jan 11 01:24:55 2008 +0000 +++ b/matroskaenc.c Fri Jan 11 01:32:45 2008 +0000 @@ -24,6 +24,7 @@ #include "riff.h" #include "xiph.h" #include "matroska.h" +#include "avc.h" typedef struct ebml_master { offset_t pos; ///< absolute offset in the file where the master's elements start @@ -479,6 +480,8 @@ ret = put_xiph_codecpriv(s, dyn_cp, codec); else if (codec->codec_id == CODEC_ID_FLAC) ret = put_flac_codecpriv(s, dyn_cp, codec); + else if (codec->codec_id == CODEC_ID_H264) + ret = isom_write_avcc(dyn_cp, codec->extradata, codec->extradata_size); else if (codec->extradata_size) put_buffer(dyn_cp, codec->extradata, codec->extradata_size); } else if (codec->codec_type == CODEC_TYPE_VIDEO) {