Mercurial > libavformat.hg

changeset 2923:0fde8da65761 libavformat

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Use the isom avcc formatting for h264 extradata in matroska.
author aurel
date Fri, 11 Jan 2008 01:32:45 +0000
parents dcd599833abc
children 110b408106af
files matroskaenc.c
diffstat 1 files changed, 3 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- 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) {