Statistics
| Branch: | Revision:

ffmpeg / libavformat / matroskaenc.c @ 4dcde00c

History | View | Annotate | Download (40.5 KB)

# Date Author Comment
6dc7d80d 04/03/2011 08:47 PM Anton Khirnov

avio: avio_ prefix for url_close_dyn_buf

b92c5452 04/03/2011 08:46 PM Anton Khirnov

avio: avio_ prefix for url_open_dyn_buf

8978feda 04/03/2011 08:46 PM Anton Khirnov

avio: introduce an AVIOContext.seekable field

Use it instead of url_is_streamed and AVIOContext.is_streamed.

264935c9 03/23/2011 01:01 PM Anton Khirnov

matroskaenc: remove a variable that's unused after bc17bd9.

Signed-off-by: Ronald S. Bultje <>

bc17bd90 03/23/2011 01:39 AM Anton Khirnov

matroskaenc: simplify get_aac_sample_rates by using ff_mpeg4audio_get_config

This also fixes broken SBR detection, which produced files with double
sample rate since 8ae0fa2.

Signed-off-by: Ronald S. Bultje <>

2912e87a 03/19/2011 01:33 PM Mans Rullgard

Replace FFmpeg with Libav in licence headers

Signed-off-by: Mans Rullgard <>

b7f2fdde 03/17/2011 02:59 AM Anton Khirnov

avio: rename put_flush_packet -> avio_flush

Signed-off-by: Ronald S. Bultje <>

a2704c97 03/04/2011 04:26 PM Anton Khirnov

avio: add avio_tell macro as a replacement for url_ftell

Signed-off-by: Ronald S. Bultje <>

6b4aa5da 03/01/2011 05:12 PM Anton Khirnov

avio: avio_ prefix for url_fseek

Signed-off-by: Ronald S. Bultje <>

77eb5504 02/21/2011 07:25 PM Anton Khirnov

avio: avio: avio_ prefixes for put_* functions

In the name of consistency:
put_byte -> avio_w8
put_<type> -> avio_w<type>
put_buffer -> avio_write

put_nbyte will be made private
put_tag will be merged with avio_put_str

Signed-off-by: Ronald S. Bultje <>

ae628ec1 02/20/2011 01:37 PM Anton Khirnov

avio: rename ByteIOContext to AVIOContext.

Signed-off-by: Ronald S. Bultje <>

737eb597 02/15/2011 03:18 PM Reinhard Tartler

Merge libavcore into libavutil

It is pretty hopeless that other considerable projects will adopt
libavutil alone in other projects. Projects that need small footprint
are better off with more specialized libraries such as gnulib or rather
just copy the necessary parts that they need. With this in mind, nobody...

c6610a21 01/26/2011 10:10 PM Diego Elio Pettenò

Prefix all _demuxer, _muxer, _protocol from libavformat and libavdevice.

This also lists the objects from those two libraries as internal (by adding
the ff_ prefix) so that they can then be hidden via linker scripts.

eaa4542b 11/23/2010 08:24 AM Anton Khirnov

matroskaenc: don't duplicate title information

Title is already written into special fields designated for it --
per-segment Title, per-chapter ChapString and per-stream Name (yay for
consistent naming). Therefore, don't duplicate it in Tags.

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

ba7d6e79 11/03/2010 08:19 PM Stefano Sabatini

Remove usage of deprecated libavcodec/audioconvert.h functions.

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

03700d39 10/15/2010 07:04 PM Anton Khirnov

Export metadata in the generic format. Deprecate old conversion API.
patch by Anton Khirnov anton at khirnov dot net

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

9b75309c 10/05/2010 09:40 AM Anton Khirnov

matroskaenc: write metadata
patch by Anton Khirnov anton at khirnov dot net

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

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

d00a3516 07/14/2010 07:36 PM Aurelien Jacobs

matroskaenc: write DisplayUnit element to better match the spec
This makes it clear that we are specifying the aspect ratio, and not
the intended display size in pixels.

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

49bd8e4b 06/30/2010 03:38 PM Måns Rullgård

Fix grammar errors in documentation

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

5150dd53 06/08/2010 10:44 AM Måns Rullgård

matroska: move LFG state from muxer context to local variable

The LFG is only used in one place, so there is no need to keep it in
the context.

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

e7ddafd5 06/04/2010 10:41 PM David Conrad

matroskaenc: Don't write a second seekhead for the clusters; mkvalidate agrees
with me that it's unnecessary.

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

d06735a3 06/04/2010 10:41 PM David Conrad

matroskaenc: Check that tracks was allocated

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

1f4280e7 06/04/2010 10:41 PM David Conrad

matroskaenc: Use av_get_random_seed -> lfg for segment UID

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

4a6bef1f 06/04/2010 10:40 PM David Conrad

matroskaenc: Make put_ebml_binary take a void pointer

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

316d6c15 06/04/2010 10:40 PM James Zern

Add WebM muxer

Patch by James Zern <jzern at google>

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

ac9baa71 06/04/2010 10:40 PM James Zern

matroskaenc: Mux clusters better

Start them on keyframes when reasonable, and delay writing audio packets
to help ensure that there's audio samples available for the first frame in
clusters.

Patch by James Zern <jzern at google>

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

7bb83d8d 05/24/2010 08:58 AM David Conrad

matroskaenc: Write codec time base as default duration for video tracks.

This isn't exactly semantically equivalent, but the field has already been
long abused to mean this, and writing it helps in determining a decent cfr
time base when transcoding from a mkv where the video codec stores none (VP8)....

577abedb 05/22/2010 01:41 AM David Conrad

matroskaenc: Don't write track timecode scale

It's not required for mkv and unsupported in webm

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

cc947f04 03/31/2010 12:29 PM Jean-Daniel Dupas

Replace all occurences of PKT_FLAG_KEY with AV_PKT_FLAG_KEY.

Patch by Jean-Daniel Dupas, devlists shadowlab org

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

72415b2a 03/30/2010 11:30 PM Stefano Sabatini

Define AVMediaType enum, and use it instead of enum CodecType, which
is deprecated and will be dropped at the next major bump.

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

4896dd57 03/25/2010 02:34 PM Jai Menon

Matroska muxer : Don't create audio tracks for unsupported audio codecs.

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

d692850b 03/24/2010 11:11 AM Carl Eugen Hoyos

Silence ridiculous gcc warning.

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

66061a12 03/20/2010 01:36 PM James Darnley

Add VorbisComment writing to FLAC files.
Patch by James Darnley <james darnley at gmail>.

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

f75ab7a6 03/15/2010 07:03 PM Jai Menon

cosmetics : Print newline after error message.

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

f9ff7179 03/09/2010 04:23 AM David Conrad

mkvenc: Handle negative timestamps correctly

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

654b65d0 03/09/2010 04:23 AM David Conrad

mkvenc: Don't try to write packets with unknown timestamps

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

84d4e599 03/09/2010 04:23 AM David Conrad

mkvenc: write dts for VFW mode

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

871b641b 03/04/2010 08:53 AM David Conrad

Ensure that we write clusters and blocks with known size when streaming

Too many demuxers can't cope with clusters of unknown size.

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

434a70b8 03/04/2010 08:53 AM David Conrad

Fix indentation

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

30f06a58 03/04/2010 08:53 AM David Conrad

Simplify starting and ending clusters

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

7a2a4840 03/04/2010 08:53 AM David Conrad

Write the first seekhead if writing to a stream, we won't be able to seek
back and write it at the end

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

2529bb30 03/04/2010 08:53 AM David Conrad

Attempt seeking to write EBML master sizes even if streamed

Most EBML masters are much smaller than IO_BUFFER_SIZE and thus the size
can be updated. This makes parsing the resulting files easier.

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

690b4126 03/03/2010 11:27 PM Anton Khirnov

matroskaenc: use "title" tag instead of "description" in track title.

Patch by Anton Khirnov < whyskas at gmail >

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

e380b918 01/21/2010 08:49 PM Rafaël Carré

mkvenc: Write TrackTimecodeScale
patch by Rafael (dot) Carre (a) gmail (d) com

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

2bd0758e 10/18/2009 12:17 PM Anton Khirnov

matroskaenc: Add support for writing chapters.
patch by Anton Khirnov wyskas at gmail dot com

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

1a40491e 06/22/2009 11:09 PM Daniel Verkamp

Add ff_ prefixes to exported symbols in libavformat/riff.h.
patch by Daniel Verkamp, aniel drv nu

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

2578326f 02/26/2009 02:41 AM Justin Ruggles

Share the function to write a raw FLAC header and use it in the Matroska
muxer.

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

59c6178a 02/26/2009 02:29 AM Justin Ruggles

Use a shared function to validate FLAC extradata.

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

25918212 02/24/2009 03:04 PM Michael Niedermayer

Add AVFMT_VARIABLE_FPS to specify which muxers do not need duplicated frames.

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

5e565998 02/15/2009 04:53 PM Aurelien Jacobs

matroskaenc: use new metadata API

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

5f8bae8d 01/20/2009 12:52 AM Aurelien Jacobs

matroskaenc: correctly handle h264 streams with 3 bytes nal startcodes
This implies using ff_avc_parse_nal_units_buf instead of ff_avc_parse_nal_units
because with 3 bytes startcodes the parsed packet size will change, and the
size must be written before the packet content....

3194b004 01/17/2009 04:31 AM David Conrad

Cosmetics: indent

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

1c3db2aa 01/17/2009 04:31 AM David Conrad

Treat disposition==0 as undefined and don't write the default flag

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

8a86aaa3 01/17/2009 04:30 AM David Conrad

Flush the buffer after writing the header and when done with writing the files
Fixes writing small (~4kb) files.

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

ca93bc17 01/15/2009 02:07 PM Luca Abeni

Reindent after last commit

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

0a63a676 01/15/2009 02:03 PM Luca Abeni

Do not reallocate AVPacket's data when muxing a packet

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

6a5d31ac 01/11/2009 10:19 PM Diego Biurrun

Fix build: Add intreadwrite.h and bswap.h #includes where necessary.

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

abce34d9 10/22/2008 09:14 PM Aurelien Jacobs

matroskaenc: require global header
fixes issue696

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

b7f4e76d 10/04/2008 10:57 PM Aurelien Jacobs

matroskaenc: correct muxing of ASS packets
- split packets to store one ASS event line per Matroska block
- reformat ASS events to Matroska modified format
- extract display duration for ASS events to store as Matroska block duration

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

291902c2 10/04/2008 10:47 PM Aurelien Jacobs

matroskaenc: use correct EBML ID for block duration

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

1bfbe8ff 10/04/2008 10:44 PM Aurelien Jacobs

matroskaenc: pass the packet size directly as parameter of mkv_blockgroup_size()

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

8401c514 10/04/2008 10:41 PM Aurelien Jacobs

matroskaenc: remove useless mkv_block_size() function

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

bc5c918e 10/03/2008 10:16 AM Diego Biurrun

Remove offset_t typedef and use int64_t directly instead.
The name offset_t is easily confused with the standard off_t type and
*_t is POSIX reserved namespace if any POSIX header is included.

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

62c24705 09/04/2008 11:08 PM Aurelien Jacobs

matroska: subtitle display duration must be stored in pkt->convergence_duration

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

c1854592 08/24/2008 04:51 PM Reimar Döffinger

Change codec_tag type from const struct AVCodecTag ** to const struct AVCodecTag * const *

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

59729451 08/23/2008 11:43 PM Aurelien Jacobs

convert every muxer/demuxer to write/read sample_aspect_ratio from/to
the corresponding AVStream instead of AVCodecContext

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

5968d2dd 08/05/2008 08:28 AM Diego Biurrun

misc spelling/grammar fixes

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

cc8be506 08/05/2008 12:42 AM Aurelien Jacobs

matroska: expand useless define for MS compat codec id strings

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

f009e36f 07/27/2008 03:11 PM Aurelien Jacobs

matroska: add support for V_QUICKTIME track type

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

bde15e74 06/03/2008 04:20 PM Stefano Sabatini

Make long_names in lavf/lavdev optional depending on CONFIG_SMALL.
patch by Stefano Sabatini, stefano.sabatini-lala poste.it
along with some spelling/consistency fixes for the long names by me

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

245976da 05/09/2008 11:56 AM Diego Biurrun

Use full path for #includes from another directory.

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

8a0684f4 05/01/2008 10:04 PM Justin Ruggles

fix encoding of flac private data

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

7bfacd4e 04/02/2008 09:41 PM Aurelien Jacobs

use common aac sample rate tables

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

90c2295b 03/07/2008 07:25 PM Evgeniy Stepanov

Add 'disposition' bitfield to AVStream and use it for both muxing and demuxing
of matroska and nut.

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

73260a11 03/01/2008 12:26 AM Aurelien Jacobs

simplification proposed by Rich

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

0b247953 02/27/2008 12:53 AM Aurelien Jacobs

makes really sure that no undefined behavior can happen

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

d597655f 02/26/2008 10:35 PM Aurelien Jacobs

Avoid infinite loop.
uint64_t >> 64 is an undefined operation

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

2024c226 01/12/2008 12:15 AM Michael Niedermayer

Write 0 instead of seeking forward (and leaving bytes uninitalized),
fixes odd regression test failure i had.

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

9ab3f71b 01/11/2008 11:33 PM Aurelien Jacobs

add a ff_ prefix to newly exported functions from avc.c

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

e609806e 01/11/2008 11:21 PM Aurelien Jacobs

Matroska muxer needs to format all NAL units, not only extradata.

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

aacc5f22 01/11/2008 01:32 AM Aurelien Jacobs

Use the isom avcc formatting for h264 extradata in matroska.

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

899681cd 11/21/2007 07:41 AM Björn Axelsson

Use dynamically allocated ByteIOContext in AVFormatContext

patch by: Björn Axelsson, bjorn d axelsson a intinor d se
thread: [PATCH] Remove static ByteIOContexts, 06 nov 2007

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

bf898960 09/05/2007 08:31 PM Diego Biurrun

spelling/wording nits in some Doxygen comments

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

ab332d01 09/05/2007 12:26 AM David Conrad

Grammar nits

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

b62a33d0 09/05/2007 12:26 AM David Conrad

Always use AVFormatContext for av_log messages

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

0f651e8c 09/05/2007 12:26 AM David Conrad

Rename ebml size functions to indicate that they can be used for more kinds of numbers

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

8b65b9a3 09/05/2007 12:26 AM David Conrad

We shouldn't be passing in sizes larger than 2^56-2, so use an assert

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

e5c29287 09/05/2007 12:26 AM David Conrad

Indentation

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

ac9e1177 09/05/2007 12:26 AM David Conrad

Don't seek when streamed

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

c301d5ae 09/05/2007 12:25 AM David Conrad

Get rid of useless braces

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

7e33d3fe 09/05/2007 12:25 AM David Conrad

Indent

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

dc4a9f67 09/05/2007 12:25 AM David Conrad

Match the behaviour betwen the bmp and wav codec tag lookups

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

46d18a88 09/05/2007 12:25 AM David Conrad

Write codecprivate to a dynamic buffer so that seeking isn't required

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

5c559894 09/05/2007 12:25 AM David Conrad

Move writing codec private element to its own function

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

211783a5 09/05/2007 12:25 AM David Conrad

Cosmetics

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

91ca9690 09/05/2007 12:25 AM David Conrad

Use num_entries directly rather than mixing it with a local copy

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

e3cd80cd 09/05/2007 12:25 AM David Conrad

Doxygenify comments

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

7f8582df 09/05/2007 12:25 AM David Conrad

Make sure that the calculated duration doesn't decrease

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

8ffc5f9e 09/05/2007 12:25 AM David Conrad

Split some really long lines

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