From aacc5f227a58776406bc896736b6cb8c36058f43 Mon Sep 17 00:00:00 2001 From: Aurelien Jacobs Date: Fri, 11 Jan 2008 01:32:45 +0000 Subject: Use the isom avcc formatting for h264 extradata in matroska. Originally committed as revision 11499 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavformat/matroskaenc.c | 3 +++ 1 file changed, 3 insertions(+) (limited to 'libavformat') diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c index 667ea3f534..09f975af42 100644 --- a/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c @@ -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 @@ static int mkv_write_codecprivate(AVFormatContext *s, ByteIOContext *pb, AVCodec 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) { -- cgit v1.2.3