Statistics
| Branch: | Revision:

ffmpeg / libavformat / matroska.c @ 4dcde00c

History | View | Annotate | Download (3.8 KB)

# Date Author Comment
2912e87a 03/19/2011 01:33 PM Mans Rullgard

Replace FFmpeg with Libav in licence headers

Signed-off-by: Mans Rullgard <>

2701fd40 07/25/2010 09:16 PM Aurelien Jacobs

matroskaenc: add support for muxing SRT tracks

Originally committed as revision 24503 to svn://svn.ffmpeg.org/ffmpeg/trunk

23966972 05/19/2010 04:50 PM Google

matroska: Add V_VP8

Patch by Google

Originally committed as revision 23192 to svn://svn.ffmpeg.org/ffmpeg/trunk

6b10228a 03/12/2010 11:49 PM Aurelien Jacobs

matroskadec: add support for SIPR audio tracks

Originally committed as revision 22492 to svn://svn.ffmpeg.org/ffmpeg/trunk

ca76a119 02/01/2010 11:39 AM Anton Khirnov

Add a list of generic tags and change demuxers to follow it.
Patch by Anton Khirnov, wyskas at gmail dot com

Originally committed as revision 21587 to svn://svn.ffmpeg.org/ffmpeg/trunk

39c6b3f5 01/27/2010 10:39 PM Carl Eugen Hoyos

Support demuxing Blu-ray subtitles in matroska files.

Patch sent to mailing list by Taylor Ralph, taylor D ralph A gmail

Originally committed as revision 21491 to svn://svn.ffmpeg.org/ffmpeg/trunk

b89894ab 03/30/2009 09:37 PM Aurelien Jacobs

matroska: add support for MLP and TRUEHD codec tags

Originally committed as revision 18254 to svn://svn.ffmpeg.org/ffmpeg/trunk

719e721a 03/01/2009 12:12 AM Aurelien Jacobs

Add some basic metadata conversion tables for matroska and asf.
Add missing const qualifiers for metadata_conv in AV{In|Out}putFormat.

Originally committed as revision 17671 to svn://svn.ffmpeg.org/ffmpeg/trunk

737dccfc 12/12/2008 04:04 PM Aurelien Jacobs

matroska: sort codec tags list

Originally committed as revision 16081 to svn://svn.ffmpeg.org/ffmpeg/trunk

ea2a5dec 12/12/2008 03:55 PM Kurtnoise

matroska: add dirac support (patch by Kurtnoise kurtnoise at free dot fr)

Originally committed as revision 16080 to svn://svn.ffmpeg.org/ffmpeg/trunk

23cdcb22 09/01/2008 03:50 PM Aurelien Jacobs

matroska: add E-AC-3 support
Thanks again Justin !

Originally committed as revision 15146 to svn://svn.ffmpeg.org/ffmpeg/trunk

eb9cf50a 08/20/2008 12:49 AM Aurelien Jacobs

matroska: add support for most variants of PCM

Originally committed as revision 14862 to svn://svn.ffmpeg.org/ffmpeg/trunk

20fb02c5 08/05/2008 12:42 AM Aurelien Jacobs

matroskadec: remove useless comments in ff_mkv_codec_tags

Originally committed as revision 14606 to svn://svn.ffmpeg.org/ffmpeg/trunk

d3d265b2 07/27/2008 03:12 PM Aurelien Jacobs

matroska: add support for A_QUICKTIME/QDM2 codec

Originally committed as revision 14430 to svn://svn.ffmpeg.org/ffmpeg/trunk

f8d7c9d3 01/27/2008 03:43 PM Evgeniy Stepanov

Add support for Matroska attachments.
patch by eugeni dot stepanov at gmail.com and myself

Originally committed as revision 11635 to svn://svn.ffmpeg.org/ffmpeg/trunk

4f632b06 01/07/2008 12:03 AM Aurelien Jacobs

Make ff_mkv_codec_tags lie entirely in .rodata section.
From: Diego 'Flameeyes' Pettenò < flameeyes at gmail dot com >

Originally committed as revision 11440 to svn://svn.ffmpeg.org/ffmpeg/trunk

f9a9b350 12/29/2007 08:49 PM Evgeniy Stepanov

export raw SSA tracks with their own codec ID (patch by Evgeniy Stepanov)

Originally committed as revision 11352 to svn://svn.ffmpeg.org/ffmpeg/trunk

73a727f3 12/02/2007 09:52 PM Reimar Döffinger

Make ff_mkv_codec_tags array const, it is never written.

Originally committed as revision 11137 to svn://svn.ffmpeg.org/ffmpeg/trunk

c3ce4161 09/06/2007 05:14 AM David Conrad

Use V_MPEG4/ISO/ASP for mpeg4 when muxing mkv

Originally committed as revision 10421 to svn://svn.ffmpeg.org/ffmpeg/trunk

b75c8d16 08/24/2007 12:49 AM David Conrad

Add V_SNOW

Originally committed as revision 10200 to svn://svn.ffmpeg.org/ffmpeg/trunk

868e43d9 07/25/2007 03:59 PM Aurelien Jacobs

use the most appropriate codec id for A_MPEG/L1 and L2

Originally committed as revision 9794 to svn://svn.ffmpeg.org/ffmpeg/trunk

0f40b54c 07/25/2007 03:58 PM Aurelien Jacobs

reorder matroska codec tags so that the encoder picks up the appropriate tag

Originally committed as revision 9793 to svn://svn.ffmpeg.org/ffmpeg/trunk

ee8c87b5 07/16/2007 02:51 PM Aurelien Jacobs

add support for S_ASS and S_SSA codec string

Originally committed as revision 9704 to svn://svn.ffmpeg.org/ffmpeg/trunk

979c0910 07/11/2007 01:37 PM Aurelien Jacobs

add support for ASS like subtitles in Matroska

Originally committed as revision 9593 to svn://svn.ffmpeg.org/ffmpeg/trunk

f7e97aaf 07/11/2007 01:13 PM Aurelien Jacobs

add support for Matroska subtitle tracks

Originally committed as revision 9591 to svn://svn.ffmpeg.org/ffmpeg/trunk

eabb8ba4 06/04/2007 10:19 PM Aurelien Jacobs

add support for real audio in matroska

Originally committed as revision 9217 to svn://svn.ffmpeg.org/ffmpeg/trunk

b061d892 06/04/2007 10:10 PM David Conrad

split some common code from the mkv demuxer that will be useful to the muxer
patch by David Conrad umovimus at gmail.com

Originally committed as revision 9215 to svn://svn.ffmpeg.org/ffmpeg/trunk

57004ff1 04/15/2007 01:51 PM Aurelien Jacobs

add an enum for need_parsing

Originally committed as revision 8742 to svn://svn.ffmpeg.org/ffmpeg/trunk

7fdcdf25 04/10/2007 11:27 AM Aurelien Jacobs

cosmetics: indentation

Originally committed as revision 8707 to svn://svn.ffmpeg.org/ffmpeg/trunk

6207bb20 04/09/2007 05:03 PM Aurelien Jacobs

add support for seeking to a keyframe instead of a random frame

Originally committed as revision 8698 to svn://svn.ffmpeg.org/ffmpeg/trunk

79f26346 04/09/2007 05:00 PM Aurelien Jacobs

add an intermediate variable (prepare for next patch)

Originally committed as revision 8697 to svn://svn.ffmpeg.org/ffmpeg/trunk

cca9b6cd 04/09/2007 04:48 PM Aurelien Jacobs

add support for seeking in matroska files

Originally committed as revision 8696 to svn://svn.ffmpeg.org/ffmpeg/trunk

df06539a 04/09/2007 04:45 PM Aurelien Jacobs

move matroska_find_track_by_num() upper in the file
so that it can be used by other part of the code

Originally committed as revision 8695 to svn://svn.ffmpeg.org/ffmpeg/trunk

67545b0c 04/09/2007 04:29 PM Aurelien Jacobs

cluster position is relative to segment_start

Originally committed as revision 8694 to svn://svn.ffmpeg.org/ffmpeg/trunk

01344104 04/09/2007 04:27 PM Aurelien Jacobs

properly set streams start_time

Originally committed as revision 8693 to svn://svn.ffmpeg.org/ffmpeg/trunk

8e7a7e6a 04/09/2007 04:24 PM Aurelien Jacobs

remove unused context field

Originally committed as revision 8692 to svn://svn.ffmpeg.org/ffmpeg/trunk

794857ae 04/09/2007 04:22 PM Aurelien Jacobs

remove wrong and no more used packet reordering code

Originally committed as revision 8691 to svn://svn.ffmpeg.org/ffmpeg/trunk

87e87886 04/08/2007 11:34 AM Michael Niedermayer

allocate 32 extra bytes at the end of the probe buffer and remove most probe buf_size checks

Originally committed as revision 8677 to svn://svn.ffmpeg.org/ffmpeg/trunk

8509fc7b 03/25/2007 01:11 AM Aurelien Jacobs

add support for V_THEORA into Matroska
Original thread:
Date: Thu, 22 Mar 2007 20:23:08 -0400
Subject: [Ffmpeg-devel] [PATCH] Theora in MKV (GSoC '07 Qualification)

Originally committed as revision 8507 to svn://svn.ffmpeg.org/ffmpeg/trunk

262e2bee 03/15/2007 11:08 PM Aurelien Jacobs

disable pts reordering code and initialize a parser instead

Originally committed as revision 8418 to svn://svn.ffmpeg.org/ffmpeg/trunk

5ae4975c 03/13/2007 12:21 AM Aurelien Jacobs

remove outdated comment

Originally committed as revision 8370 to svn://svn.ffmpeg.org/ffmpeg/trunk

2b1785b7 03/13/2007 12:20 AM Aurelien Jacobs

remove no more needed parameters

Originally committed as revision 8369 to svn://svn.ffmpeg.org/ffmpeg/trunk

086b0ad8 03/13/2007 12:16 AM Aurelien Jacobs

set pkt->duration for laced packets too

Originally committed as revision 8366 to svn://svn.ffmpeg.org/ffmpeg/trunk

9b54ab15 03/13/2007 12:10 AM Aurelien Jacobs

calculate pts for laced packets

Originally committed as revision 8365 to svn://svn.ffmpeg.org/ffmpeg/trunk

7fde6331 03/13/2007 12:02 AM Aurelien Jacobs

calculate default_duration for AAC tracks

Originally committed as revision 8364 to svn://svn.ffmpeg.org/ffmpeg/trunk

25f2b76f 03/13/2007 12:01 AM Aurelien Jacobs

scale duration and default_duration

Originally committed as revision 8363 to svn://svn.ffmpeg.org/ffmpeg/trunk

916bf03a 03/12/2007 09:58 PM Aurelien Jacobs

move timecode calculation out of laces loop

Originally committed as revision 8359 to svn://svn.ffmpeg.org/ffmpeg/trunk

ded669f8 03/11/2007 11:44 PM Aurelien Jacobs

cosmetic: indent after last commit

Originally committed as revision 8335 to svn://svn.ffmpeg.org/ffmpeg/trunk

ac9073c9 03/11/2007 11:40 PM Aurelien Jacobs

reorder pts of packets from tracks using V_MPEG* codecs

Originally committed as revision 8334 to svn://svn.ffmpeg.org/ffmpeg/trunk

3d20538d 03/11/2007 11:19 PM Aurelien Jacobs

revert r7181
This was a stupid mistake. We already take care of time_scale
in av_set_pts_info().

Originally committed as revision 8333 to svn://svn.ffmpeg.org/ffmpeg/trunk

6bed20f4 03/11/2007 11:05 PM Aurelien Jacobs

check if current block contains a B frame and gives this info to parse_block()

Originally committed as revision 8332 to svn://svn.ffmpeg.org/ffmpeg/trunk

4d41f3ee 03/11/2007 10:54 PM Aurelien Jacobs

extract ebml_read_binary() out of matroska_parse_block()
This allows to read all the blockgroup parameters before
parsing the block itself.

Originally committed as revision 8331 to svn://svn.ffmpeg.org/ffmpeg/trunk

12f3278d 03/11/2007 10:28 PM Aurelien Jacobs

reindent after last commit

Originally committed as revision 8330 to svn://svn.ffmpeg.org/ffmpeg/trunk

0fb7a2b9 03/11/2007 10:26 PM Aurelien Jacobs

parse clusters until some packets are queued
instead of parsing only one cluster

Originally committed as revision 8329 to svn://svn.ffmpeg.org/ffmpeg/trunk

0f3bd8ce 03/11/2007 10:19 PM Aurelien Jacobs

fix a stupid bug in ebml_read_sint()

Originally committed as revision 8328 to svn://svn.ffmpeg.org/ffmpeg/trunk

912c94f3 03/11/2007 10:16 PM Aurelien Jacobs

use codec_get_id() instead of deprecated codec_get_[bmp/wav]_id()

Originally committed as revision 8327 to svn://svn.ffmpeg.org/ffmpeg/trunk

3c58dc0b 03/02/2007 12:14 AM Aurelien Jacobs

don't rely on a specific appearance order for ebml elements at the same level

Originally committed as revision 8181 to svn://svn.ffmpeg.org/ffmpeg/trunk

0cc5ea2e 03/02/2007 12:06 AM Aurelien Jacobs

add support for simple blocks (ie. matroska v2)

Originally committed as revision 8180 to svn://svn.ffmpeg.org/ffmpeg/trunk

de7779b5 03/01/2007 11:50 PM Aurelien Jacobs

cosmetics: fix indentation of the new matroska_parse_block() function

Originally committed as revision 8179 to svn://svn.ffmpeg.org/ffmpeg/trunk

1afdcdf1 03/01/2007 11:46 PM Aurelien Jacobs

split a matroska_parse_block() function from matroska_parse_blockgroup()

Originally committed as revision 8178 to svn://svn.ffmpeg.org/ffmpeg/trunk

ebfcf31d 03/01/2007 11:36 PM Aurelien Jacobs

fix an off-by-one error in probing function
this prevented correct detection of Mushishi24-head.mkv

Originally committed as revision 8177 to svn://svn.ffmpeg.org/ffmpeg/trunk

fead30d4 01/19/2007 10:12 PM Alex Beregszaszi

rename BE/LE_8/16/32 to AV_RL/B_8/16/32

Originally committed as revision 7587 to svn://svn.ffmpeg.org/ffmpeg/trunk

be691b10 11/28/2006 11:41 PM Aurelien Jacobs

matroska: scale timecode according to time_scale
fixes jerky playback of planet.earth.mkv

Originally committed as revision 7181 to svn://svn.ffmpeg.org/ffmpeg/trunk

b9d32859 11/23/2006 10:26 PM Aurelien Jacobs

No need for special trick anymore for flac in matroska.
The flac decoder now understand full metadata header in extradata.

Originally committed as revision 7162 to svn://svn.ffmpeg.org/ffmpeg/trunk

d9d6e7b7 11/21/2006 11:47 PM Aurelien Jacobs

add support for FLAC in matroska

Originally committed as revision 7150 to svn://svn.ffmpeg.org/ffmpeg/trunk

0d6d9632 11/20/2006 08:16 PM Aurelien Jacobs

add support for tta in matroska

Originally committed as revision 7138 to svn://svn.ffmpeg.org/ffmpeg/trunk

9a313fe0 11/20/2006 12:33 AM Aurelien Jacobs

cosmetics: reindent after last commit

Originally committed as revision 7130 to svn://svn.ffmpeg.org/ffmpeg/trunk

a487d231 11/20/2006 12:31 AM Aurelien Jacobs

matroska: split real video frames so that each packet contains only one slice

Originally committed as revision 7129 to svn://svn.ffmpeg.org/ffmpeg/trunk

363c86ce 11/20/2006 12:15 AM Aurelien Jacobs

matroska: properly handle real video extradata

Originally committed as revision 7128 to svn://svn.ffmpeg.org/ffmpeg/trunk

a76920d8 11/20/2006 12:04 AM Aurelien Jacobs

simplify free()+set to NULL using av_freep()

Originally committed as revision 7127 to svn://svn.ffmpeg.org/ffmpeg/trunk

7e244702 11/12/2006 04:59 PM Aurelien Jacobs

Allows playback of truncated matroska files.

Originally committed as revision 6989 to svn://svn.ffmpeg.org/ffmpeg/trunk

82bfffaf 11/11/2006 12:56 AM Steve L'Homme

Fix wrong comment.
Patch by Steve Lhomme % slhomme A divxcorp P com %
Original thread:
Date: Fri, 10 Nov 2006 15:29:50 +0100
Subject: [Ffmpeg-devel] [PATCH] fix a comment

Originally committed as revision 6965 to svn://svn.ffmpeg.org/ffmpeg/trunk

5d352ca9 11/11/2006 12:49 AM Steve L'Homme

Add A_AAC codec identifier support in matroska.
Patch by Steve Lhomme % slhomme A divxcorp P com %
Original thread:
Date: Fri, 10 Nov 2006 15:22:33 +0100
Subject: [Ffmpeg-devel] [PATCH] Handle "A_AAC" in matroska codec IDs

Originally committed as revision 6964 to svn://svn.ffmpeg.org/ffmpeg/trunk

cbee7a69 11/09/2006 11:37 AM Baptiste Coudurier

get rid of CODEC_ID_MPEG4AAC after next version bump, and change it to CODEC_ID_AAC where used

Originally committed as revision 6954 to svn://svn.ffmpeg.org/ffmpeg/trunk

09c2b942 11/08/2006 08:13 PM Aurelien Jacobs

add support for AAC in matroska

Originally committed as revision 6947 to svn://svn.ffmpeg.org/ffmpeg/trunk

4647c0ec 11/08/2006 08:09 PM Aurelien Jacobs

add audio output sampling freqency reading in matroska

Originally committed as revision 6946 to svn://svn.ffmpeg.org/ffmpeg/trunk

95cc43b2 11/08/2006 06:53 PM Aurelien Jacobs

Better way to detect cluster (fix files encoded with Haali's muxer).

Originally committed as revision 6943 to svn://svn.ffmpeg.org/ffmpeg/trunk

0ab07420 11/07/2006 12:11 AM Aurelien Jacobs

Allow reading matroska title.

Originally committed as revision 6927 to svn://svn.ffmpeg.org/ffmpeg/trunk

5b99b90d 11/06/2006 11:58 PM Aurelien Jacobs

cosmetics: reindent after last commit

Originally committed as revision 6926 to svn://svn.ffmpeg.org/ffmpeg/trunk

ce99efc6 11/06/2006 11:57 PM Aurelien Jacobs

Don't need to check for NULL before av_free().
And don't need to memset(0) the no more used priv_data.

Originally committed as revision 6925 to svn://svn.ffmpeg.org/ffmpeg/trunk

ae17bf6a 11/06/2006 11:52 PM Steve L'Homme

Add support for block duration.
Patch by Steve Lhomme % slhomme A divxcorp P com %
Original thread:
Date: Mon, 06 Nov 2006 19:22:14 +0100
Subject: [Ffmpeg-devel] [PATCH] Matroska block duration support

Originally committed as revision 6924 to svn://svn.ffmpeg.org/ffmpeg/trunk

063c8f26 11/06/2006 11:14 PM Steve L'Homme

Ensure codec_id = CODEC_ID_NONE for unknown codecs (don't reuse previous one).
Patch by Steve Lhomme % slhomme A divxcorp P com %
Original thread:
Date: Mon, 06 Nov 2006 21:20:14 +0100
Subject: [Ffmpeg-devel] [PATCH] Matroska known/unknown codec

Originally committed as revision 6923 to svn://svn.ffmpeg.org/ffmpeg/trunk

b9756b2e 11/06/2006 11:07 PM Steve L'Homme

guess matroska files frame rate
Patch by Steve Lhomme % slhomme A divxcorp P com %
Original thread:
Date: Mon, 06 Nov 2006 21:28:52 +0100
Subject: [Ffmpeg-devel] [PATCH] Matroska FPS info

Originally committed as revision 6922 to svn://svn.ffmpeg.org/ffmpeg/trunk

1c75f2bc 11/06/2006 07:01 PM Steve L'Homme

remove floats in 10 bytes/byte support (no version of matroska used it)
Patch by Steve Lhomme % slhomme A divxcorp P com %
Original thread:
Date: Nov 6, 2006 7:24 PM
Subject: [Ffmpeg-devel] [PATCH] no 10 bytes floats

Originally committed as revision 6919 to svn://svn.ffmpeg.org/ffmpeg/trunk

3f509ba1 11/06/2006 06:07 AM Kostya Shishkov

WavPack support in Matroska

Originally committed as revision 6909 to svn://svn.ffmpeg.org/ffmpeg/trunk

b78e7197 10/07/2006 03:30 PM Diego Biurrun

Change license headers to say 'FFmpeg' instead of 'this program/this library'
and fix GPL/LGPL version mismatches.

Originally committed as revision 6577 to svn://svn.ffmpeg.org/ffmpeg/trunk

191e8ca7 09/27/2006 07:47 PM Måns Rullgård

fix some signedness warnings

Originally committed as revision 6355 to svn://svn.ffmpeg.org/ffmpeg/trunk

9d9f4119 07/12/2006 12:09 AM Måns Rullgård

move common stuff from avienc.c and wav.c to new file riff.c

Originally committed as revision 5720 to svn://svn.ffmpeg.org/ffmpeg/trunk

ff70e601 07/10/2006 09:14 PM Måns Rullgård

allow individual selection of muxers and demuxers

Originally committed as revision 5707 to svn://svn.ffmpeg.org/ffmpeg/trunk

d2a067d1 07/09/2006 11:40 PM Måns Rullgård

give AVInput/OutputFormat structs consistent names

Originally committed as revision 5697 to svn://svn.ffmpeg.org/ffmpeg/trunk

a97c1e93 06/17/2006 03:53 PM Stefan Huehner

Add (mostly) const to variable and parameter declaration, where a char* was
used and 'const char*' should be, plus make some function declarations
static if they aren't used outside their declaring source file.
patch by Stefan Huehner stefan%%at%%huehner%%dot%%org...

a5e9102b 06/16/2006 07:54 AM Måns Rullgård

free codec extradata in av_close_input_file

Originally committed as revision 5484 to svn://svn.ffmpeg.org/ffmpeg/trunk

d766800b 03/25/2006 07:51 PM Michael Niedermayer

dont set random timestamps if they are not known

Originally committed as revision 5219 to svn://svn.ffmpeg.org/ffmpeg/trunk

78a11456 03/25/2006 07:40 PM Michael Niedermayer

fixing timebase

Originally committed as revision 5218 to svn://svn.ffmpeg.org/ffmpeg/trunk

662710ed 03/25/2006 01:37 PM Steve L'Homme

Rename time variable to the more descriptive block_time.
patch by Steve Lhomme steve.....lhomme..@..free.....fr

Originally committed as revision 5216 to svn://svn.ffmpeg.org/ffmpeg/trunk

d439facb 03/22/2006 11:11 AM Steve L'Homme

duration and subitle fix from the patch by Steve Lhomme

Originally committed as revision 5196 to svn://svn.ffmpeg.org/ffmpeg/trunk

70596d04 03/22/2006 11:06 AM Michael Niedermayer

cleanup codec_id mapping (untested)

Originally committed as revision 5195 to svn://svn.ffmpeg.org/ffmpeg/trunk

68ca39b2 03/22/2006 10:33 AM Michael Niedermayer

fix aspect ratio

Originally committed as revision 5192 to svn://svn.ffmpeg.org/ffmpeg/trunk

a851b8e8 01/30/2006 11:32 PM Dieter

add missing #includes
patch by Dieter <freebsd at sopwith solgatos com>

Originally committed as revision 4912 to svn://svn.ffmpeg.org/ffmpeg/trunk

5509bffa 01/12/2006 10:43 PM Diego Biurrun

Update licensing information: The FSF changed postal address.

Originally committed as revision 4842 to svn://svn.ffmpeg.org/ffmpeg/trunk