RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Use the isom avcc formatting for h264 extradata in matroska. 

Originally committed as revision 11499 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Aurelien Jacobs 2008-01-11 01:32:45 +00:00
parent 1bd2d763d4
commit aacc5f227a
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libavformat/matroskaenc.c
View File

@ -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) {