Commit aacc5f22 authored by Aurelien Jacobs's avatar Aurelien Jacobs
Browse files

Use the isom avcc formatting for h264 extradata in matroska.

Originally committed as revision 11499 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 1bd2d763
......@@ -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) {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment