diff options
| author | Aurelien Jacobs <aurel@gnuage.org> | 2008-01-11 01:32:45 +0000 |
|---|---|---|
| committer | Aurelien Jacobs <aurel@gnuage.org> | 2008-01-11 01:32:45 +0000 |
| commit | aacc5f227a58776406bc896736b6cb8c36058f43 (patch) | |
| tree | 2e1c604ee909d6dfb94be07841ca5269c0f0a5dd /libavformat | |
| parent | 1bd2d763d4ad7e66017c51cdbcb395711e6a53e6 (diff) | |
| download | ffmpeg-aacc5f227a58776406bc896736b6cb8c36058f43.tar.gz | |
Use the isom avcc formatting for h264 extradata in matroska.
Originally committed as revision 11499 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/matroskaenc.c | 3 |
1 files changed, 3 insertions, 0 deletions
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) { |